summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-11-25 17:03:30 -0500
committerRobert Speicher <rspeicher@gmail.com>2015-11-25 17:03:30 -0500
commit91c0aa5e982ee5e3299e6b8c899bfc396fe51279 (patch)
tree5b1b9034173c47ce3693a6193f1879dfd970ae33 /Gemfile.lock
parentdee28c50a90acaf1a364d3971132c70c96493932 (diff)
downloadgitlab-ce-91c0aa5e982ee5e3299e6b8c899bfc396fe51279.tar.gz
Bump asana to ~> 0.4.0rs-update-asana
Closes #2830
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock18
1 files changed, 9 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 46247dd88e2..24aadef5c76 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -29,10 +29,6 @@ GEM
actionpack (>= 4.0.0, < 5)
activerecord (>= 4.0.0, < 5)
railties (>= 4.0.0, < 5)
- activeresource (4.0.0)
- activemodel (~> 4.0)
- activesupport (~> 4.0)
- rails-observers (~> 0.1.1)
activesupport (4.1.14)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
@@ -48,8 +44,11 @@ GEM
activerecord (>= 3.2, <= 4.3)
rake (~> 10.4)
arel (5.0.1.20140414130214)
- asana (0.0.6)
- activeresource (>= 3.2.3)
+ asana (0.4.0)
+ faraday (~> 0.9)
+ faraday_middleware (~> 0.9)
+ faraday_middleware-multi_json (~> 0.0)
+ oauth2 (~> 1.0)
asciidoctor (1.5.2)
ast (2.1.0)
astrolabe (1.3.1)
@@ -191,6 +190,9 @@ GEM
multipart-post (>= 1.2, < 3)
faraday_middleware (0.10.0)
faraday (>= 0.7.4, < 0.10)
+ faraday_middleware-multi_json (0.0.6)
+ faraday_middleware
+ multi_json
fastercsv (1.5.5)
ffaker (2.0.0)
ffi (1.9.10)
@@ -523,8 +525,6 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.14)
sprockets-rails (~> 2.0)
- rails-observers (0.1.2)
- activemodel (~> 4.0)
railties (4.1.14)
actionpack (= 4.1.14)
activesupport (= 4.1.14)
@@ -795,7 +795,7 @@ DEPENDENCIES
addressable (~> 2.3.8)
after_commit_queue
annotate (~> 2.6.0)
- asana (~> 0.0.6)
+ asana (~> 0.4.0)
asciidoctor (~> 1.5.2)
attr_encrypted (~> 1.3.4)
awesome_print (~> 1.2.0)