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.lock | |
| parent | d4f3fca93bf31680b7cb23f6e68e809b864b27e8 (diff) | |
| parent | 137c5822ecfb07bf453198f4025c4a30b100fc86 (diff) | |
| download | gitlab-ce-76de6327d8eab3123f06f612e8f623424599ad91.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8930680c563..53006552276 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -294,7 +294,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab-markup (1.5.1) + gitlab-markup (1.6.2) gitlab_omniauth-ldap (2.0.4) net-ldap (~> 0.16) omniauth (~> 1.3) @@ -881,6 +881,7 @@ GEM ffi sysexits (1.2.0) temple (0.7.7) + test-prof (0.2.5) test_after_commit (1.1.0) activerecord (>= 3.2) text (1.3.1) @@ -1023,7 +1024,7 @@ DEPENDENCIES gitaly-proto (~> 0.33.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) - gitlab-markup (~> 1.5.1) + gitlab-markup (~> 1.6.2) gitlab_omniauth-ldap (~> 2.0.4) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) @@ -1159,6 +1160,7 @@ DEPENDENCIES stackprof (~> 0.2.10) state_machines-activerecord (~> 0.4.0) sys-filesystem (~> 1.1.6) + test-prof (~> 0.2.5) test_after_commit (~> 1.1) thin (~> 1.7.0) timecop (~> 0.8.0) |