summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2019-04-22 18:07:19 +0200
committerBob Van Landuyt <bob@vanlanduyt.co>2019-04-29 08:28:43 +0200
commit33cf8edae170890ccd4510490f1dcd2f345c81fa (patch)
tree4d989e20136ecf21d5f89df59ea7dbb43c534a55 /Gemfile.lock
parentee4ccd31556f8be905e968af448bbb4ecf62dcb6 (diff)
downloadgitlab-ce-33cf8edae170890ccd4510490f1dcd2f345c81fa.tar.gz
Port changes for design management to CE
This ports the changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10462/ to CE
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 64f2f78a4f8..ceece1da8d7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -52,6 +52,9 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
aes_key_wrap (1.0.1)
akismet (2.0.0)
+ apollo_upload_server (2.0.0.beta.3)
+ graphql (>= 1.8)
+ rails (>= 4.2)
arel (8.0.0)
asana (0.8.1)
faraday (~> 0.9)
@@ -988,6 +991,7 @@ DEPENDENCIES
acts-as-taggable-on (~> 6.0)
addressable (~> 2.5.2)
akismet (~> 2.0)
+ apollo_upload_server (~> 2.0.0.beta3)
asana (~> 0.8.1)
asciidoctor (~> 1.5.8)
asciidoctor-plantuml (= 0.0.8)