summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-12-01 16:02:26 +0200
committerValery Sizov <vsv2711@gmail.com>2015-12-08 09:05:02 +0200
commit2e270c0705895f7535ca3f62abc1c1a9cbff769d (patch)
treeacd0df2ab4046d3115bf58d9e93d87084100eb59
parente02940e32941cc253f713ef3fe0aac896c9342ac (diff)
downloadgitlab-ce-gemfile_fix.tar.gz
add explicit reference to rouge 1.10.1gemfile_fix
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock1
2 files changed, 3 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 25e30e0211a..fc4d565fc84 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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)