summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2018-07-02 13:57:38 +0000
committerLin Jen-Shin <godfat@godfat.org>2018-07-09 21:13:08 +0800
commit9286f5b9340f92131c320c231a5fb3e51c23bf04 (patch)
tree49bbb5c1ebc03a9fda46791273e949a8e467710f /Gemfile.lock
parent4ee08b77bc5ae11553d59c182ea8292b77699115 (diff)
downloadgitlab-ce-9286f5b9340f92131c320c231a5fb3e51c23bf04.tar.gz
Use stable gitlab-styles and eliminate offenses
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock16
1 files changed, 5 insertions, 11 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 41d22f3ec89..ad0675ddb8f 100644
--- a/Gemfile.lock
+++ b/Gemfile.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:
@@ -322,6 +312,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)
@@ -1049,7 +1043,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)