Skip to content
This repository was archived by the owner on Feb 8, 2026. It is now read-only.

Commit dd8333f

Browse files
damianlegawiecdamianlegawiec
authored
Merge pull request #450 from spark-solutions/feature/3-5-release
3.5 release
2 parents 15d657c + d1bd9e7 commit dd8333f

21 files changed

Lines changed: 45 additions & 32 deletions

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ rvm:
2222
gemfile:
2323
- gemfiles/spree_3_2.gemfile
2424
- gemfiles/spree_3_5.gemfile
25-
- gemfiles/spree_3_6.gemfile
25+
- gemfiles/spree_3_7.gemfile
2626
- gemfiles/spree_master.gemfile
2727

2828
matrix:

‎Appraisals‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ appraise 'spree-3-5' do
88
gem 'rails-controller-testing'
99
end
1010

11-
appraise 'spree-3-6' do
12-
gem 'spree', '~> 3.6.0'
11+
appraise 'spree-3-7' do
12+
gem 'spree', '~> 3.7.0.rc3'
1313
gem 'rails-controller-testing'
1414
end
1515

lib/controllers/frontend/spree/user_confirmations_controller.rb renamed to app/controllers/spree/user_confirmations_controller.rb

File renamed without changes.

lib/controllers/frontend/spree/user_passwords_controller.rb renamed to app/controllers/spree/user_passwords_controller.rb

File renamed without changes.

lib/controllers/frontend/spree/user_registrations_controller.rb renamed to app/controllers/spree/user_registrations_controller.rb

File renamed without changes.

lib/controllers/frontend/spree/user_sessions_controller.rb renamed to app/controllers/spree/user_sessions_controller.rb

File renamed without changes.

lib/views/frontend/spree/shared/_login.html.erb renamed to app/views/spree/shared/_login.html.erb

File renamed without changes.

lib/views/frontend/spree/shared/_user_form.html.erb renamed to app/views/spree/shared/_user_form.html.erb

File renamed without changes.

lib/views/frontend/spree/user_mailer/confirmation_instructions.text.erb renamed to app/views/spree/user_mailer/confirmation_instructions.text.erb

File renamed without changes.

lib/views/frontend/spree/user_mailer/reset_password_instructions.text.erb renamed to app/views/spree/user_mailer/reset_password_instructions.text.erb

File renamed without changes.

0 commit comments

Comments
 (0)