diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-12-08 07:49:07 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-12-08 07:49:07 +0000 |
| commit | 7f90c8efcc0c8d63fadd293419be679a25e43c95 (patch) | |
| tree | acd0df2ab4046d3115bf58d9e93d87084100eb59 | |
| parent | e02940e32941cc253f713ef3fe0aac896c9342ac (diff) | |
| parent | 2e270c0705895f7535ca3f62abc1c1a9cbff769d (diff) | |
| download | gitlab-ce-7f90c8efcc0c8d63fadd293419be679a25e43c95.tar.gz | |
Merge branch 'gemfile_fix' into 'master'
Add explicit reference to rouge 1.10.1
We are relying on rouge 1.10.1 but nothing is referencing to this version and it is easy to lose this dependence. Previously, it was updated directly in Gemfile.lock which is not reliable way :)
https://gitlab.com/gitlab-org/gitlab-ce/commit/e20529cec4f6de0c2c1589da99abb8714ea1c1c1
`gollum-lib` has a dependence `rouge 1.9` which is old for us.
See merge request !1937
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 1 |
2 files changed, 3 insertions, 1 deletions
@@ -99,7 +99,7 @@ gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 1.5.2' -gem 'net-ssh', '~> 3.0.1' +gem 'rouge', '~> 1.10.1' # Diffs gem 'diffy', '~> 3.0.3' @@ -205,6 +205,7 @@ gem 'raphael-rails', '~> 2.1.2' gem 'request_store', '~> 1.2.0' gem 'select2-rails', '~> 3.5.9' gem 'virtus', '~> 1.0.1' +gem 'net-ssh', '~> 3.0.1' group :development do gem "foreman" diff --git a/Gemfile.lock b/Gemfile.lock index 9e7b93be3ab..5d70788d981 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -940,6 +940,7 @@ DEPENDENCIES request_store (~> 1.2.0) rerun (~> 0.10.0) responders (~> 2.0) + rouge (~> 1.10.1) rqrcode-rails3 (~> 0.1.7) rspec-rails (~> 3.3.0) rubocop (~> 0.28.0) |