diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 12:08:09 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 12:08:09 +0000 |
| commit | 0d0cddc9ce20c5a7d8a2723d0aa620ca184a711a (patch) | |
| tree | 64f91b4d4ca74aa09d2a62ac5910820d087ed7cb /Gemfile.lock | |
| parent | 6044caed20964a70c1ac6c5a3365d567ed96dfde (diff) | |
| download | gitlab-ce-0d0cddc9ce20c5a7d8a2723d0aa620ca184a711a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a1a8f20f4c5..7cd5be09e68 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -398,7 +398,7 @@ GEM gitlab-puma (>= 2.7, < 5) gitlab-sidekiq-fetcher (0.5.2) sidekiq (~> 5) - gitlab-styles (3.1.0) + gitlab-styles (3.2.0) rubocop (~> 0.74.0) rubocop-gitlab-security (~> 0.1.0) rubocop-performance (~> 1.4.1) @@ -1240,7 +1240,7 @@ DEPENDENCIES gitlab-puma (~> 4.3.3.gitlab.2) gitlab-puma_worker_killer (~> 0.1.1.gitlab.1) gitlab-sidekiq-fetcher (= 0.5.2) - gitlab-styles (~> 3.1.0) + gitlab-styles (~> 3.2.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) |