diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-07-27 05:31:57 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-07-27 05:33:42 -0700 |
| commit | 7eec1ed7a100999395faec3acdda8a5bdca739f0 (patch) | |
| tree | 2c63765e4989d923a10564bbab1b18ae819e309c | |
| parent | 31044d41a63dd1b8f57df12b864210d84361c219 (diff) | |
| download | gitlab-ce-sh-bump-github-linguist-6.3.1.tar.gz | |
Bump github-linguist to 6.3.1sh-bump-github-linguist-6.3.1
This matches the version shipped with Gitaly.
Relates to gitlab-org/omnibus-gitlab#3698
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-bump-github-linguist-6-3-1.yml | 5 |
3 files changed, 11 insertions, 6 deletions
@@ -86,7 +86,7 @@ gem 'gitlab-gollum-lib', '~> 4.2', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false # Language detection -gem 'github-linguist', '~> 5.3.3', require: 'linguist' +gem 'github-linguist', '~> 6.1', require: 'linguist' # API gem 'grape', '~> 1.0' diff --git a/Gemfile.lock b/Gemfile.lock index d147f81c81e..3378ecaa066 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -187,7 +187,7 @@ GEM encryptor (3.0.0) equalizer (0.0.11) erubis (2.7.0) - escape_utils (1.1.1) + escape_utils (1.2.1) et-orbi (1.0.3) tzinfo eventmachine (1.0.8) @@ -287,9 +287,9 @@ GEM gitaly-proto (0.109.0) google-protobuf (~> 3.1) grpc (~> 1.10) - github-linguist (5.3.3) - charlock_holmes (~> 0.7.5) - escape_utils (~> 1.1.0) + github-linguist (6.3.1) + charlock_holmes (~> 0.7.6) + escape_utils (~> 1.2.0) mime-types (>= 1.19) rugged (>= 0.25.1) github-markup (1.7.0) @@ -1049,7 +1049,7 @@ DEPENDENCIES gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) gitaly-proto (~> 0.109.0) - github-linguist (~> 5.3.3) + github-linguist (~> 6.1) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-gollum-lib (~> 4.2) gitlab-gollum-rugged_adapter (~> 0.4.4) diff --git a/changelogs/unreleased/sh-bump-github-linguist-6-3-1.yml b/changelogs/unreleased/sh-bump-github-linguist-6-3-1.yml new file mode 100644 index 00000000000..7736a904899 --- /dev/null +++ b/changelogs/unreleased/sh-bump-github-linguist-6-3-1.yml @@ -0,0 +1,5 @@ +--- +title: Bump github-linguist to 6.3.1 +merge_request: 20872 +author: +type: other |