Skip to content
This repository was archived by the owner on Oct 31, 2023. It is now read-only.

Commit 18bc66e

Browse files
committed
Upgrade to Rails 5.0
[Closes #6]
1 parent 5ab2457 commit 18bc66e

File tree

65 files changed

+43793
-328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+43793
-328
lines changed

.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ before_script:
1919

2020
integration:
2121
script:
22-
- ./vendor/bin/install_phantomjs.sh
22+
- apt-get update -q && apt-get install chromium-driver -yq
2323
- ./bin/ci

.rubocop.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
require: rubocop-rspec
22

3+
RSpec/FilePath:
4+
Enabled: false
5+
36
RSpec/NestedGroups:
47
Enabled: false
58

@@ -37,6 +40,7 @@ Metrics:
3740
Enabled: false
3841

3942
# Naming
43+
4044
Naming/PredicateName:
4145
Enabled: false
4246

@@ -45,9 +49,6 @@ Naming/PredicateName:
4549
Rails:
4650
Enabled: true
4751

48-
Rails/FilePath:
49-
Enabled: false
50-
5152
# Style
5253

5354
Style/Documentation:
@@ -56,6 +57,9 @@ Style/Documentation:
5657
Style/GlobalVars:
5758
AllowedVariables: [$redis]
5859

60+
Style/MixinUsage:
61+
Exclude: [bin/*]
62+
5963
Style/SafeNavigation:
6064
Enabled: false
6165

.travis.yml

+4
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,7 @@ script: ./bin/ci
55
after_script: '[ "$TRAVIS_RUBY_VERSION" != "2.5.6" ] || bundle exec rake coveralls:push'
66
rvm:
77
- 2.5.6
8+
- 2.6.4
9+
matrix:
10+
allow_failures:
11+
- rvm: 2.6.4

Gemfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "rails", "~> 4.2"
5+
gem "rails", "~> 5.0.0"
66
gem "puma"
77
gem "sass-rails"
88
gem "uglifier" # Use Uglifier as compressor for JavaScript assets
@@ -16,7 +16,7 @@ gem "jquery-rails" # Use jquery as the JavaScript library
1616

1717
# Our additional Gems are listed below
1818
gem "secure_headers", "< 4" # TODO: upgrade
19-
gem "rails-i18n"
19+
gem "rails-i18n", "~> 5.1" # for 5.0.x, 5.1.x and 5.2.x
2020
gem "crazy_money"
2121
gem "ordinalize_full", require: "ordinalize_full/integer"
2222
gem "buckybox-api" # to use the git version: git: "https://github.com/buckybox/buckybox-api-ruby"
@@ -61,7 +61,7 @@ group :test do
6161
gem "cucumber-rails", require: false
6262
gem "capybara", require: false
6363
gem "capybara-screenshot"
64-
gem "poltergeist", require: false
64+
gem "selenium-webdriver", require: false
6565
gem "webmock", require: false
6666
gem "vcr", require: false
6767
end

0 commit comments

Comments
 (0)