From ccf54188dbd2d82507db0d02ef2d2c7d63273e76 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Wed, 4 Jul 2018 16:19:35 +0000
Subject: [PATCH] Use latest gitlab-styles
---
Gemfile | 2 +-
Gemfile.lock | 18 ++++++------------
Gemfile.rails5.lock | 18 ++++++------------
3 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/Gemfile b/Gemfile
index 30852f3f699db..031fa059420bb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -363,7 +363,7 @@ group :development, :test do
gem 'spring', '~> 2.0.0'
gem 'spring-commands-rspec', '~> 1.0.4'
- gem 'gitlab-styles', '~> 2.4', git: 'https://gitlab.com/gitlab-org/gitlab-styles.git', branch: '2.4.1-rc', require: false
+ gem 'gitlab-styles', '~> 2.4', require: false
# Pin these dependencies, otherwise a new rule could break the CI pipelines
gem 'rubocop', '~> 0.54.0'
gem 'rubocop-rspec', '~> 1.22.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 760b0b588b89c..99bb2bea924f9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,13 +1,3 @@
-GIT
- remote: https://gitlab.com/gitlab-org/gitlab-styles.git
- revision: ea26af1601c6341f15b62a71b337208541cf7c1a
- branch: 2.4.1-rc
- specs:
- gitlab-styles (2.4.1)
- rubocop (~> 0.54.0)
- rubocop-gitlab-security (~> 0.1.0)
- rubocop-rspec (~> 1.19)
-
GEM
remote: https://rubygems.org/
specs:
@@ -347,6 +337,10 @@ GEM
posix-spawn (~> 0.3)
gitlab-license (1.0.0)
gitlab-markup (1.6.4)
+ gitlab-styles (2.4.1)
+ 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)
@@ -820,7 +814,7 @@ GEM
unicode-display_width (~> 1.0, >= 1.0.1)
rubocop-gitlab-security (0.1.1)
rubocop (>= 0.51)
- rubocop-rspec (1.22.1)
+ rubocop-rspec (1.22.2)
rubocop (>= 0.52.1)
ruby-enum (0.7.2)
i18n
@@ -1084,7 +1078,7 @@ DEPENDENCIES
gitlab-gollum-rugged_adapter (~> 0.4.4)
gitlab-license (~> 1.0)
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)
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock
index 4e85b9444ac6c..3df09da8ed7f6 100644
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -1,13 +1,3 @@
-GIT
- remote: https://gitlab.com/gitlab-org/gitlab-styles.git
- revision: ea26af1601c6341f15b62a71b337208541cf7c1a
- branch: 2.4.1-rc
- specs:
- gitlab-styles (2.4.1)
- rubocop (~> 0.54.0)
- rubocop-gitlab-security (~> 0.1.0)
- rubocop-rspec (~> 1.19)
-
GEM
remote: https://rubygems.org/
specs:
@@ -350,6 +340,10 @@ GEM
posix-spawn (~> 0.3)
gitlab-license (1.0.0)
gitlab-markup (1.6.4)
+ gitlab-styles (2.4.1)
+ 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)
@@ -829,7 +823,7 @@ GEM
unicode-display_width (~> 1.0, >= 1.0.1)
rubocop-gitlab-security (0.1.1)
rubocop (>= 0.51)
- rubocop-rspec (1.22.1)
+ rubocop-rspec (1.22.2)
rubocop (>= 0.52.1)
ruby-enum (0.7.2)
i18n
@@ -1094,7 +1088,7 @@ DEPENDENCIES
gitlab-gollum-rugged_adapter (~> 0.4.4)
gitlab-license (~> 1.0)
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)
--
GitLab