aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2017-07-25 13:57:55 -0400
committerGitHub <noreply@github.com>2017-07-25 13:57:55 -0400
commitc146065b8df8b3893b9ae33111987d5f1c18d457 (patch)
tree7f40514f1efc1b3bd6fa4eb72c3ac0e828eb9aa3 /Gemfile.lock
parentf516ee09d5e4685d62b792d412269a618de13f38 (diff)
parent4c8c48eb7f466d8388df82ad27346f9467cacfdf (diff)
downloadrails-c146065b8df8b3893b9ae33111987d5f1c18d457.tar.gz
rails-c146065b8df8b3893b9ae33111987d5f1c18d457.tar.bz2
rails-c146065b8df8b3893b9ae33111987d5f1c18d457.zip
Merge pull request #29940 from kamipo/update_gemfile_lock
Update Gemfile.lock to reflect arel 9.0.0.alpha
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 8eb41405fe..a6f7286994 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,9 +31,9 @@ GIT
GIT
remote: https://github.com/rails/arel.git
- revision: 0e7ce3f4c7c17e72f905b26aff3893149f524888
+ revision: f4227bf20a16a1d688afc24cf0038e2f98905dd4
specs:
- arel (8.0.0)
+ arel (9.0.0.alpha)
GIT
remote: https://github.com/rails/sass-rails.git
@@ -81,7 +81,7 @@ PATH
activerecord (5.2.0.alpha)
activemodel (= 5.2.0.alpha)
activesupport (= 5.2.0.alpha)
- arel (~> 8.0)
+ arel (= 9.0.0.alpha)
activesupport (5.2.0.alpha)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)