summaryrefslogtreecommitdiff
path: root/Gemfile.rails5.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.rails5.lock')
-rw-r--r--Gemfile.rails5.lock16
1 files changed, 5 insertions, 11 deletions
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock
index b74cbf41343..e167bbcb52e 100644
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -1,13 +1,3 @@
-GIT
- remote: https://gitlab.com/gitlab-org/gitlab-styles.git
- revision: f3250343d3a13a154fe9b2d356440654297b0624
- branch: update-to-0.54.0
- specs:
- gitlab-styles (2.4.0)
- rubocop (~> 0.54.0)
- rubocop-gitlab-security (~> 0.1.0)
- rubocop-rspec (~> 1.19)
-
GEM
remote: https://rubygems.org/
specs:
@@ -325,6 +315,10 @@ GEM
mime-types (>= 1.16)
posix-spawn (~> 0.3)
gitlab-markup (1.6.4)
+ gitlab-styles (2.4.0)
+ rubocop (~> 0.54.0)
+ rubocop-gitlab-security (~> 0.1.0)
+ rubocop-rspec (~> 1.19)
gitlab_omniauth-ldap (2.0.4)
net-ldap (~> 0.16)
omniauth (~> 1.3)
@@ -1059,7 +1053,7 @@ DEPENDENCIES
gitlab-gollum-lib (~> 4.2)
gitlab-gollum-rugged_adapter (~> 0.4.4)
gitlab-markup (~> 1.6.4)
- gitlab-styles (~> 2.4)!
+ gitlab-styles (~> 2.4)
gitlab_omniauth-ldap (~> 2.0.4)
gon (~> 6.2)
google-api-client (~> 0.19.8)