diff options
author | Ken <ken.ding@mail.com> | 2018-02-21 03:29:04 +1030 |
---|---|---|
committer | Ken <ken.ding@mail.com> | 2018-02-21 03:29:04 +1030 |
commit | ed0a029d53c5a62b49027a0b7192b97a0513787f (patch) | |
tree | b15ca1ab18e1e2a08102a713f6b15d4fac4a0d23 /Gemfile.lock | |
parent | 0e2ba2326ca3ff499138cabb563a159b48631771 (diff) | |
download | gitlab-ce-ed0a029d53c5a62b49027a0b7192b97a0513787f.tar.gz |
26039 - update github-linguist to 5.3.3 version
26039 - add merge request id
26039 change due to lingust source file updates
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8de6c8d80a8..32c35353a74 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -288,11 +288,11 @@ GEM gitaly-proto (0.84.0) google-protobuf (~> 3.1) grpc (~> 1.0) - github-linguist (4.7.6) - charlock_holmes (~> 0.7.3) + github-linguist (5.3.3) + charlock_holmes (~> 0.7.5) escape_utils (~> 1.1.0) mime-types (>= 1.19) - rugged (>= 0.23.0b) + rugged (>= 0.25.1) github-markup (1.6.1) gitlab-flowdock-git-hook (1.0.1) flowdock (~> 0.7) @@ -1058,7 +1058,7 @@ DEPENDENCIES gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) gitaly-proto (~> 0.84.0) - github-linguist (~> 4.7.0) + github-linguist (~> 5.3.3) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) gitlab-styles (~> 2.3) |