diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-21 16:01:25 -0500 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-21 16:01:25 -0500 |
| commit | 76de6327d8eab3123f06f612e8f623424599ad91 (patch) | |
| tree | 97011a543bdb50d78be20d9e5776c2dec6e70b62 /Gemfile | |
| parent | d4f3fca93bf31680b7cb23f6e68e809b864b27e8 (diff) | |
| parent | 137c5822ecfb07bf453198f4025c4a30b100fc86 (diff) | |
| download | gitlab-ce-76de6327d8eab3123f06f612e8f623424599ad91.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -116,7 +116,7 @@ gem 'seed-fu', '~> 2.3.5' # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' gem 'deckar01-task_list', '2.0.0' -gem 'gitlab-markup', '~> 1.5.1' +gem 'gitlab-markup', '~> 1.6.2' gem 'redcarpet', '~> 3.4' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 4.2' @@ -362,6 +362,7 @@ group :test do gem 'sham_rack', '~> 1.3.6' gem 'timecop', '~> 0.8.0' gem 'concurrent-ruby', '~> 1.0.5' + gem 'test-prof', '~> 0.2.5' end gem 'octokit', '~> 4.6.2' |