diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-07-09 17:23:30 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-07-09 17:23:30 +0100 |
| commit | 2a4039cf668c23156d49eae7f84837fb527f2549 (patch) | |
| tree | 7add56decfeff4220bce9a840f700bffd98f395c /Gemfile.lock | |
| parent | ab3c91a702a6a38374d574488ba4841758842505 (diff) | |
| parent | 72c99b58abe7bbc956804c9d403689e64f579d3e (diff) | |
| download | gitlab-ce-2a4039cf668c23156d49eae7f84837fb527f2549.tar.gz | |
Merge branch 'update-rubocop'
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ee5da96665c..1b8a777ceb4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -312,8 +312,8 @@ GEM mime-types (>= 1.16) posix-spawn (~> 0.3) gitlab-markup (1.6.4) - gitlab-styles (2.3.2) - rubocop (~> 0.51) + 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) @@ -776,16 +776,16 @@ 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) 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 @@ -1043,7 +1043,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 +1143,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) |