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.

Sign up for GitHub

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

Jump to bottom

Upgrade to rails 5 #1947

Merged
merged 82 commits into from
Apr 23, 2019
Merged

Upgrade to rails 5 #1947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
c6de990
Upgrade gem rails and its dependecies
microweb10 Mar 27, 2019
798c047
updates config files
xuanxu Sep 14, 2016
851c50c
updates Devise spec helpers required
xuanxu Sep 14, 2016
43ef417
fixes expire cache specs
voodoorai2000 Oct 24, 2016
094233c
removes uniq deprecation warning
voodoorai2000 Oct 25, 2016
f011cab
removes devise-async for delayed devise emails
alejanderl Apr 6, 2017
b0061d4
removes configurations and settings for devise-async
alejanderl Apr 6, 2017
caa803e
replaces uniq with distinct
alejanderl Apr 4, 2017
b6d6162
fixes deprecation warning for `uniq`
alejanderl May 2, 2017
34df580
Fix uniq deprecation warning
voodoorai2000 Apr 8, 2018
35ff828
Fix deprecation warning for `.uniq` usage
aitbw Aug 7, 2018
46418f6
Fix deprecated devise syntax
voodoorai2000 Apr 7, 2018
4f2f6d2
Changes autorize path method.
alejanderl Apr 4, 2017
d11ff0b
fixes specs with current devise response implementation
xuanxu Jun 16, 2017
b32680a
fixes activity specs
voodoorai2000 May 3, 2017
9eb073e
permits parameters in urls
voodoorai2000 Oct 26, 2016
75136ec
fixes some deprecation warnings
alejanderl May 1, 2017
60e633c
fixes specs related to ActionController params
voodoorai2000 Oct 24, 2016
850ffdd
fixes lock specs
voodoorai2000 Oct 24, 2016
5a43cf5
Remove ProgressBar overrided translation class
microweb10 Mar 25, 2019
1edf69a
Remove Budget::Group overrided translation class
microweb10 Mar 25, 2019
92472e8
Remove Budget overrided translation class
microweb10 Mar 25, 2019
71df3c7
Remove Budget::Heading overrided translation class
microweb10 Mar 25, 2019
264cd9c
Remove Budget::Phase overrided translation class
microweb10 Mar 25, 2019
c4a39dc
Remove milestone overrided translation class
Senen Jan 24, 2019
f8ef705
Changes autorize path method. (custom)
microweb10 Mar 28, 2019
726b859
Fix queries and scopes after column deletion
Senen Jan 17, 2019
febb118
Fix queries and scopes after column deletion
Senen Jan 17, 2019
f0a96db
Fix queries and scopes after column deletion
taitus Mar 26, 2019
398d4c1
Fix specs heading_specs.rb:313
taitus Mar 23, 2019
0d937c5
Update helpers after globalize gem version update
Senen Jan 17, 2019
0130952
protect_from_forgery is not prepended by default
xuanxu Sep 14, 2016
678417a
Move before_save to Translations class for Budget::Group model
microweb10 Mar 28, 2019
1a3fc8a
fixes deprecation warning relate to raise_in_transactional_callbacks
alejanderl May 2, 2017
0266280
Use #data_source_exists? instead of #table_exists?
microweb10 Mar 23, 2019
1d58ded
Fix ActiveModel::Errors#[]= deprecation warning
voodoorai2000 Apr 8, 2018
ddcd5ba
Remove before_filter deprecation warning
voodoorai2000 Apr 8, 2018
3a38880
Remove parameterise deprecation warning
voodoorai2000 Apr 8, 2018
c6dbe2f
Fix parameterise deprecation warning
voodoorai2000 Apr 8, 2018
628c5c4
Use `separator` key when parameterizing arguments
aitbw Aug 7, 2018
e969165
Use `separator` key when parameterizing arguments
aitbw Aug 7, 2018
a31acc1
Fix symbolize_keys deprectation warning
voodoorai2000 Apr 8, 2018
5605248
updates specs to new keyword styles
xuanxu Jun 16, 2017
44a4e89
Use `head :ok` when expecting an empty response body
aitbw Aug 8, 2018
5d021a3
removes controller spec deprecation warnings
voodoorai2000 Oct 25, 2016
d174045
removes stats controller spec deprecation warning
voodoorai2000 Oct 25, 2016
e91ea7a
updates controller specs deprecation warnings
voodoorai2000 Oct 26, 2016
9926ef2
removes controller spec deprecation warnings
alejanderl Apr 4, 2017
1ad404a
Fix `redirect_to` deprecation warning on Admin::Legislation::Processe…
aitbw Apr 12, 2018
bc10fea
Fix `redirect_to :back` deprecation warning
microweb10 Mar 29, 2019
b75e824
Fix all occurrences for `after_filter` deprecation warnings
aitbw May 3, 2018
b26bd67
Use `.where` clause first when calling `.destroy_all` method
aitbw Aug 7, 2018
6a0c5bd
sanitizes params for views
alejanderl Apr 6, 2017
0c9f035
forces params results to_h
alejanderl Apr 4, 2017
6103b7b
Fix deprecation warning calling `env' in controllers
microweb10 Mar 29, 2019
48ec33c
Fix all occurrences for `uniq` deprecation warnings
aitbw May 3, 2018
b497008
models inherits from ApplicationRecord
xuanxu Sep 14, 2016
370c070
fixes application_record parent
xuanxu Sep 14, 2016
b201498
makes models inherit from ApplicationRecord
xuanxu Jun 22, 2017
619727b
Replace all occurrences of `ActiveRecord::Base` with `ApplicationRecord`
aitbw May 3, 2018
94ebad5
Use Legislation::BaseController on instead of ApplicationController
aitbw May 7, 2018
46f50c6
Replace occurrences of ActiveRecord::Base on new models
aitbw Aug 7, 2018
1183d5d
Replace occurrences of ActiveRecord::Base on new models
microweb10 Mar 23, 2019
a46b993
Santitize description translations
Senen Jan 25, 2019
895c41b
Fix sanitization for translatable description attribute
Senen Jan 4, 2019
2c059e0
Keep method for not yet globalizable models
Senen Jan 25, 2019
3efc3b8
Fix failing tests
microweb10 Mar 31, 2019
7ccbec2
Require conflicting dependencies
microweb10 Mar 31, 2019
f980be1
Require conflicting dependencies
microweb10 Mar 31, 2019
cdd5841
Fix several rubocop warnings
microweb10 Mar 30, 2019
a8a7f95
Upgrade gem devise to version 4.6.2
microweb10 Mar 31, 2019
191aa9c
Fix failing migrations when running `rake db:migrate` task
aitbw Aug 17, 2018
064ce60
Regenerate DB schema
microweb10 Apr 1, 2019
e010121
Remove migrations warning
microweb10 Apr 1, 2019
62f0804
Fix Devise deprecation warning
microweb10 Apr 4, 2019
31a04f4
Change the way we retrireve the images urls
microweb10 Apr 4, 2019
99ba7a6
Add lib folder path to eager_load_paths
microweb10 Apr 4, 2019
a1a43b9
Set globalize fallbacks for requests
Senen Jan 28, 2019
fbba1e2
Require conflicting dependencies
microweb10 Apr 5, 2019
ecfd290
Fix failing spec
microweb10 Apr 5, 2019
b4b5a4f
Fix failing spec
microweb10 Apr 15, 2019
4029828
Prepend custom assets to CONSUL assets
javierm Apr 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
18 changes: 9 additions & 9 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '4.2.11.1'
gem "rails", "5.0.7.2"

gem 'acts-as-taggable-on', '~> 5.0.0'
gem 'acts_as_votable', '~> 0.11.1'
Expand All @@ -15,11 +15,13 @@ gem 'coffee-rails', '~> 4.2.2'
gem 'daemons', '~> 1.2.4'
gem 'dalli', '~> 2.7.6'
gem 'delayed_job_active_record', '~> 4.1.3'
gem 'devise', '~> 3.5.7'
gem 'devise-async', '~> 0.10.2'
gem 'devise_security_extension', '~> 0.10.0'
gem "devise", "~> 4.6.0"
gem "devise-async", "~> 1.0.0"
gem "devise_security_extension", git: "https://github.com/phatworx/devise_security_extension.git" #, "~> 0.10"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Metrics/LineLength: Line is too long. [110/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

gem 'foundation-rails', '~> 6.4.3.0'
gem 'foundation_rails_helper', '~> 2.0.0'
gem "globalize", "~> 5.2.0"
gem "globalize-accessors", "~> 0.2.1"
gem 'graphiql-rails', '~> 1.4.1'
gem 'graphql', '~> 1.7.8'
gem 'groupdate', '~> 3.2.0'
Expand All @@ -38,6 +40,7 @@ gem 'paperclip', '~> 5.2.1'
gem 'paranoia', '~> 2.4.1'
gem 'pg', '~> 0.21.0'
gem 'pg_search', '~> 2.0.1'
gem "record_tag_helper", "~> 1.0"
gem 'redcarpet', '~> 3.4.0'
gem 'responders', '~> 2.4.0'
gem 'rinku', '~> 2.0.2', require: 'rails_rinku'
Expand All @@ -49,11 +52,9 @@ gem 'social-share-button', '~> 1.1'
gem 'sprockets', '~> 3.7.2'
gem 'turbolinks', '~> 2.5.3'
gem 'turnout', '~> 2.4.0'
gem 'uglifier', '~> 4.1.2'
gem "uglifier", "~> 4.1.19"
gem 'unicorn', '~> 5.4.1'
gem 'whenever', '~> 0.10.0', require: false
gem 'globalize', '~> 5.0.0'
gem 'globalize-accessors', '~> 0.2.1'
gem 'recipient_interceptor', '~> 0.2.0'

source 'https://rails-assets.org' do
Expand All @@ -70,15 +71,14 @@ group :development, :test do
gem 'knapsack_pro', '~> 1.1.0'
gem 'launchy', '~> 2.4.3'
gem 'letter_opener_web', '~> 1.3.4'
gem 'quiet_assets', '~> 1.1.0'
gem 'spring', '~> 2.0.1'
gem 'spring-commands-rspec', '~> 1.0.4'
end

group :test do
gem 'capybara', '~> 2.17.0'
gem 'coveralls', '~> 0.8.22', require: false
gem 'database_cleaner', '~> 1.6.1'
gem "database_cleaner", "~> 1.7.0"
gem 'email_spec', '~> 2.1.0'
gem 'rspec-rails', '~> 3.8'
gem 'selenium-webdriver', '~> 3.141'
Expand Down