diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-02-25 13:59:25 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-02-25 13:59:25 +0300 |
| commit | 5f7a3e1bbdcb6044e4b25d0a7722b10f9140bb46 (patch) | |
| tree | 36f9c7a85a0dd20f0b271df464eed45c36e969b5 /Gemfile.lock | |
| parent | 769d1ce64bdb7c9fd3981c65bc25dd14eb176c1e (diff) | |
| parent | a30a56634d3ea44ccfc69c037324b502456f9aba (diff) | |
Merge branch 'master' into extend_markdown_upload
# Conflicts:
# app/controllers/files_controller.rb
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index df92499941a..cda85b9bf6b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,7 +81,7 @@ GEM json (>= 1.7) celluloid (0.16.0) timers (~> 4.0.0) - charlock_holmes (0.7.3) + charlock_holmes (0.6.9.4) cliver (0.3.2) coderay (1.1.0) coercible (1.0.0) @@ -188,14 +188,14 @@ GEM gitlab-flowdock-git-hook (0.4.2.2) gitlab-grit (>= 2.4.1) multi_json - gitlab-grack (2.0.0.pre) + gitlab-grack (2.0.0.rc2) rack (~> 1.5.1) gitlab-grit (2.7.2) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) mime-types (~> 1.15) posix-spawn (~> 0.3) - gitlab-linguist (3.0.0) + gitlab-linguist (3.0.1) charlock_holmes (~> 0.6.6) escape_utils (~> 0.2.4) mime-types (~> 1.19) @@ -674,8 +674,8 @@ DEPENDENCIES gemnasium-gitlab-service (~> 0.2) github-markup gitlab-flowdock-git-hook (~> 0.4.2) - gitlab-grack (~> 2.0.0.pre) - gitlab-linguist (~> 3.0.0) + gitlab-grack (~> 2.0.0.rc2) + gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.0.1.1) gitlab_git (= 7.0.0.rc14) gitlab_meta (= 7.0) |