summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-10-01 01:06:45 +0200
committerVarac <varac@leap.se>2017-10-16 13:20:16 +0200
commitd38ffd2864575cecb193c9933e0c6a40cbbaf6c3 (patch)
tree326674e72cc9c7d4be08e8b9166b3b80a9408e1a
parent782793d75212d9efc1f2d3d03e4c889c924142e8 (diff)
update Gemfile.lock
-rw-r--r--Gemfile.lock8
1 files changed, 5 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 4aaeb58..3615536 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,17 +28,17 @@ PATH
GEM
remote: https://rubygems.org/
specs:
- activesupport (5.0.0.1)
- concurrent-ruby (~> 1.0, >= 1.0.2)
+ activesupport (4.2.7.1)
i18n (~> 0.7)
+ json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
+ thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
backports (3.6.8)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.10.0)
- concurrent-ruby (1.0.2)
crack (0.4.3)
safe_yaml (~> 1.0.0)
daemons (1.2.4)
@@ -57,6 +57,7 @@ GEM
httparty (0.14.0)
multi_xml (>= 0.5.2)
i18n (0.7.0)
+ json (1.8.3)
metaclass (0.0.4)
mime-types (3.1)
mime-types-data (~> 3.2015)
@@ -135,6 +136,7 @@ PLATFORMS
ruby
DEPENDENCIES
+ activesupport (< 5.0.0)
dashing!
fakeweb (~> 1.3.0)
gitlab!