diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-03-28 10:29:08 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-07-09 21:12:31 +0800 |
| commit | 612f5e63b3cf76c354e50f4aa6c4163e5465b115 (patch) | |
| tree | 86f4a608d914dfa359828d6e904db69d76d570db /Gemfile.lock | |
| parent | acdac151f51a9f719e7ebbdf7811c3460113a8fb (diff) | |
| download | gitlab-ce-612f5e63b3cf76c354e50f4aa6c4163e5465b115.tar.gz | |
Update rubocop to get rid of a warning in other MR
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a889c4dc3a0..41d22f3ec89 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,13 @@ +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: @@ -312,10 +322,6 @@ GEM mime-types (>= 1.16) posix-spawn (~> 0.3) gitlab-markup (1.6.4) - gitlab-styles (2.3.2) - rubocop (~> 0.51) - rubocop-gitlab-security (~> 0.1.0) - rubocop-rspec (~> 1.19) gitlab_omniauth-ldap (2.0.4) net-ldap (~> 0.16) omniauth (~> 1.3) @@ -776,9 +782,9 @@ GEM pg rails sqlite3 - rubocop (0.52.1) + rubocop (0.54.0) parallel (~> 1.10) - parser (>= 2.4.0.2, < 3.0) + parser (>= 2.5) powerpack (~> 0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) @@ -1043,7 +1049,7 @@ DEPENDENCIES gitlab-gollum-lib (~> 4.2) gitlab-gollum-rugged_adapter (~> 0.4.4) gitlab-markup (~> 1.6.4) - gitlab-styles (~> 2.3) + gitlab-styles (~> 2.4)! gitlab_omniauth-ldap (~> 2.0.4) gon (~> 6.2) google-api-client (~> 0.19.8) @@ -1143,7 +1149,7 @@ DEPENDENCIES rspec-retry (~> 0.4.5) rspec-set (~> 0.1.3) rspec_profiling (~> 0.0.5) - rubocop (~> 0.52.1) + rubocop (~> 0.54.0) rubocop-rspec (~> 1.22.1) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 0.17.0) |