aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock11
1 files changed, 2 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 0aa38aac58..024864e78c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,13 +28,6 @@ GIT
json
GIT
- remote: git://github.com/rails/arel.git
- revision: 899e8428c50c586e6c8d4884b542ac9fdf01e95f
- branch: master
- specs:
- arel (7.0.0.alpha)
-
-GIT
remote: git://github.com/rails/globalid.git
revision: 4e74ec6bb60d735ef3c56080f9c9f1dee9cadaaf
branch: master
@@ -108,7 +101,7 @@ PATH
activerecord (5.0.0.alpha)
activemodel (= 5.0.0.alpha)
activesupport (= 5.0.0.alpha)
- arel (= 7.0.0.alpha)
+ arel (~> 7.0)
activesupport (5.0.0.alpha)
concurrent-ruby (~> 1.0)
i18n (~> 0.7)
@@ -139,6 +132,7 @@ GEM
remote: https://rubygems.org/
specs:
amq-protocol (2.0.0)
+ arel (7.0.0)
backburner (1.2.0)
beaneater (~> 1.0)
dante (> 0.1.5)
@@ -332,7 +326,6 @@ DEPENDENCIES
activerecord-jdbcmysql-adapter (>= 1.3.0)
activerecord-jdbcpostgresql-adapter (>= 1.3.0)
activerecord-jdbcsqlite3-adapter (>= 1.3.0)
- arel!
backburner
bcrypt (~> 3.1.10)
bcrypt-ruby (~> 3.0.0)