Skip to content

Commit

Permalink
Merge pull request #174 from fatkodima/update-railses
Browse files Browse the repository at this point in the history
Update Rails to 4.2.10 and 5.0.6 and remove gemfiles/*.gemfile.lock files
  • Loading branch information
epergo authored Jan 20, 2018
2 parents b453e52 + 88b96cf commit 60b08b4
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 495 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/.bundle/
/.yardoc
/Gemfile.lock
/gemfiles/*.gemfile.lock
/_yardoc/
/coverage/
/doc/
Expand Down
4 changes: 2 additions & 2 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# frozen_string_literal: true

appraise "rails-4" do
gem "rails", "4.2.9"
gem "rails", "4.2.10"
end

appraise "rails-5" do
gem "rails", "5.0.5"
gem "rails", "5.0.6"
end

appraise "rails-5-1" do
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_4.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

source "https://rubygems.org"

gem "rails", "4.2.9"
gem "rails", "4.2.10"

gemspec path: "../"
159 changes: 0 additions & 159 deletions gemfiles/rails_4.gemfile.lock

This file was deleted.

2 changes: 1 addition & 1 deletion gemfiles/rails_5.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

source "https://rubygems.org"

gem "rails", "5.0.5"
gem "rails", "5.0.6"

gemspec path: "../"
166 changes: 0 additions & 166 deletions gemfiles/rails_5.gemfile.lock

This file was deleted.

Loading

0 comments on commit 60b08b4

Please sign in to comment.