Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Rails 4.2 #2533

Merged
merged 50 commits into from
Apr 6, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
bc936fa
initial Rails 4.2 port
jywarren Dec 7, 2017
5adb0a9
changing over to deliver_now for mails
jywarren Dec 7, 2017
4bf77c0
updated Gemfile
jywarren Dec 7, 2017
cb8e1ff
truncating fixture field
jywarren Dec 7, 2017
be38930
nother fixture fix! fix!
jywarren Dec 7, 2017
0c8d3d2
last try with test dates for maps
jywarren Dec 7, 2017
104d567
truncation in model
jywarren Dec 7, 2017
7df42e7
strict: false in database.yml
jywarren Dec 8, 2017
4bffd0b
back to before_save filter
jywarren Dec 8, 2017
da1dd5e
deliver_now
jywarren Dec 8, 2017
edaf292
strict back off...
jywarren Dec 8, 2017
22e2bb6
truncating fixture field
jywarren Dec 7, 2017
3860745
nother fixture fix! fix!
jywarren Dec 7, 2017
9cd3bd0
back to before_save filter
jywarren Dec 8, 2017
425e46d
strict back off...
jywarren Dec 8, 2017
f3a269d
Removed the error of undefined method 'any_instance'
Souravirus Mar 2, 2018
7dd450a
changed wiki to /wiki because it was inside a integration test
Souravirus Mar 5, 2018
a3f4830
Added deliver_now in the admin_mailer and node.rb
Souravirus Mar 5, 2018
0a89fad
added test for AdminMailer.notify_node_moderators in notes_controller…
Souravirus Mar 5, 2018
4a3ac9e
Added test for AdminMailer.notify_moderators_of_spam in admin_control…
Souravirus Mar 5, 2018
b42dd41
modified the deliver.now in comment_mailer.rb
Souravirus Mar 5, 2018
c6734e5
Removed the errors related to reset_notify function in password_reset…
Souravirus Mar 6, 2018
2e7a2fd
modified the deliver_now in subscription_mailer.rb
Souravirus Mar 6, 2018
6f74b67
modified the deliver_now in welcome_mailer.rb
Souravirus Mar 6, 2018
bebed43
Converted some assert_select to css_select and wrote rails-dom-testin…
Souravirus Mar 7, 2018
e9f4738
Added Gemfile.lock
Souravirus Mar 7, 2018
005f588
Added few corrections
Souravirus Mar 12, 2018
8e2c5f2
Removed conflicts
Souravirus Mar 12, 2018
8db3caf
Modified the Gemfile.lock
Souravirus Mar 12, 2018
7e19e92
Resolved conflicts
Souravirus Mar 23, 2018
86ea930
Resolved conflicts
Souravirus Mar 23, 2018
07e77ed
Changed notes_controller
Souravirus Mar 28, 2018
9433651
Corrected some suggestions
Souravirus Mar 28, 2018
e4af3b9
corrected some assert_select in editor_controller_test
Souravirus Mar 29, 2018
ba8ab75
Completed tests of controller_test.rb
Souravirus Mar 29, 2018
8307c67
corrected some assert_select
Souravirus Mar 30, 2018
e7c187f
Removed few assert_select errors
Souravirus Mar 30, 2018
7bee71a
Removed assert_select errors from notes_controller_test.rb
Souravirus Mar 31, 2018
9d123fd
Reduced an error and removed all failures in functional
Souravirus Mar 31, 2018
33eae01
Removed the errors of tag_controller
Souravirus Mar 31, 2018
ab081d0
Fixed all the errors and failures in functional folder
Souravirus Mar 31, 2018
cd516e5
Removed errorfile
Souravirus Mar 31, 2018
0544e22
Removed all the errors
Souravirus Apr 1, 2018
0718ba1
Removed all the errors
Souravirus Apr 1, 2018
495e575
Added html-entities in rails test
Souravirus Apr 5, 2018
c4187dd
Removed all fails
Souravirus Apr 5, 2018
101db2c
Removed some depreciation warnings
Souravirus Apr 5, 2018
21a414e
Removed a fail
Souravirus Apr 5, 2018
155645f
Removed some depreciation warnings
Souravirus Apr 6, 2018
3eb6230
Some changes done as suggested by reviewers
Souravirus Apr 6, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
source 'https://rubygems.org'

gem 'rails', '~> 4.2.10'
ruby '2.3.7'

gem 'rails', '~> 4.1.16'
gem 'activerecord-session_store'
gem 'protected_attributes'
gem 'passenger'

gem "unicode-emoji"
gem 'rails-i18n', '~> 4.0.0'
# gem 'responders', '~> 2.0' # for Rails 4.2
gem 'responders', '~> 2.0' # for Rails 4.2

gem 'turbolinks'

Expand Down Expand Up @@ -39,6 +39,7 @@ gem 'uglifier', '>= 1.0.3'

# run with `bundle install --without development` to exclude these
group :development do
gem 'web-console', '~> 2.0'
gem "letter_opener"
gem "nifty-generators"
gem 'byebug'
Expand Down Expand Up @@ -112,8 +113,13 @@ gem 'jbuilder'
# Pin mustermann to Ruby 2.1 compatible
gem 'mustermann' , '~> 0.4'

#Gem for assertions used in testing
gem 'rails-dom-testing'
#OAuth Based login
gem 'omniauth', '~> 1.3', '>= 1.3.1'
gem 'omniauth-facebook', '~> 3.0'
#Gem for making tableless models
gem 'activerecord-tableless'
gem 'omniauth-google-oauth2'
gem 'figaro'
gem 'sanitize'
Loading