diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-21 15:36:58 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-21 15:36:58 +0300 |
| commit | 2505300b7b2506305a7e1af1ad2837ed72773ac6 (patch) | |
| tree | 88187926351c083c9fa2e616d9ec5974195c800d /Gemfile.lock | |
| parent | d128bc9241a1024a9e1d632555ec1e5306c89623 (diff) | |
| parent | 86dfdc36bd5f63f5ac4197c0e1e0e422555818fd (diff) | |
| download | gitlab-ce-2505300b7b2506305a7e1af1ad2837ed72773ac6.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/import/google_code_controller.rb
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9a77579d550..a134fbf6bf4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -199,7 +199,7 @@ GEM gitlab-flowdock-git-hook (0.4.2.2) gitlab-grit (>= 2.4.1) multi_json - gitlab-grack (2.0.0) + gitlab-grack (2.0.1) rack (~> 1.5.1) gitlab-grit (2.7.2) charlock_holmes (~> 0.6) @@ -702,7 +702,7 @@ DEPENDENCIES gemnasium-gitlab-service (~> 0.2) github-markup gitlab-flowdock-git-hook (~> 0.4.2) - gitlab-grack (~> 2.0.0.rc2) + gitlab-grack (~> 2.0.1) gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.1) gitlab_git (~> 7.1.10) |