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

Commit

Permalink
Upgrade to Rails 5.0
Browse files Browse the repository at this point in the history
[Closes #6]
  • Loading branch information
infertux committed Sep 3, 2019
1 parent 5ab2457 commit 18bc66e
Show file tree
Hide file tree
Showing 65 changed files with 43,793 additions and 328 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Expand Up @@ -19,5 +19,5 @@ before_script:

integration:
script:
- ./vendor/bin/install_phantomjs.sh
- apt-get update -q && apt-get install chromium-driver -yq
- ./bin/ci
10 changes: 7 additions & 3 deletions .rubocop.yml
@@ -1,5 +1,8 @@
require: rubocop-rspec

RSpec/FilePath:
Enabled: false

RSpec/NestedGroups:
Enabled: false

Expand Down Expand Up @@ -37,6 +40,7 @@ Metrics:
Enabled: false

# Naming

Naming/PredicateName:
Enabled: false

Expand All @@ -45,9 +49,6 @@ Naming/PredicateName:
Rails:
Enabled: true

Rails/FilePath:
Enabled: false

# Style

Style/Documentation:
Expand All @@ -56,6 +57,9 @@ Style/Documentation:
Style/GlobalVars:
AllowedVariables: [$redis]

Style/MixinUsage:
Exclude: [bin/*]

Style/SafeNavigation:
Enabled: false

Expand Down
4 changes: 4 additions & 0 deletions .travis.yml
Expand Up @@ -5,3 +5,7 @@ script: ./bin/ci
after_script: '[ "$TRAVIS_RUBY_VERSION" != "2.5.6" ] || bundle exec rake coveralls:push'
rvm:
- 2.5.6
- 2.6.4
matrix:
allow_failures:
- rvm: 2.6.4
6 changes: 3 additions & 3 deletions Gemfile
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

gem "rails", "~> 4.2"
gem "rails", "~> 5.0.0"
gem "puma"
gem "sass-rails"
gem "uglifier" # Use Uglifier as compressor for JavaScript assets
Expand All @@ -16,7 +16,7 @@ gem "jquery-rails" # Use jquery as the JavaScript library

# Our additional Gems are listed below
gem "secure_headers", "< 4" # TODO: upgrade
gem "rails-i18n"
gem "rails-i18n", "~> 5.1" # for 5.0.x, 5.1.x and 5.2.x
gem "crazy_money"
gem "ordinalize_full", require: "ordinalize_full/integer"
gem "buckybox-api" # to use the git version: git: "https://github.com/buckybox/buckybox-api-ruby"
Expand Down Expand Up @@ -61,7 +61,7 @@ group :test do
gem "cucumber-rails", require: false
gem "capybara", require: false
gem "capybara-screenshot"
gem "poltergeist", require: false
gem "selenium-webdriver", require: false
gem "webmock", require: false
gem "vcr", require: false
end

0 comments on commit 18bc66e

Please sign in to comment.