diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-12 04:02:37 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-12 04:02:37 +0300 |
| commit | c02d891cb5f1c1df8fb69da31c901abcc4511f5b (patch) | |
| tree | 9ab9c86c3711a673ce7c9916e041d2c9c210023b /Gemfile.lock | |
| parent | d6dda952b8eea8f6b08df9a4d12e5991929de3d4 (diff) | |
| parent | f186b20cb2e5fa59c1b7b6ac9c56141327c89e47 (diff) | |
Merge branch 'master' into new-emoji
Conflicts:
Gemfile.lock
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 32bbfbdc2de..65c5b2e3a03 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -213,7 +213,7 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.1.0) gemojione (~> 2.0) - gitlab_git (7.0.1) + gitlab_git (7.1.0) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) @@ -608,7 +608,7 @@ GEM eventmachine (>= 1.0.0) rack (>= 1.0.0) thor (0.19.1) - thread_safe (0.3.4) + thread_safe (0.3.5) tilt (1.4.1) timers (4.0.1) hitimes @@ -708,8 +708,13 @@ DEPENDENCIES gitlab-flowdock-git-hook (~> 0.4.2) gitlab-grack (~> 2.0.0.rc2) gitlab-linguist (~> 3.0.1) +<<<<<<< HEAD gitlab_emoji (~> 0.1) gitlab_git (= 7.0.1) +======= + gitlab_emoji (~> 0.0.1.1) + gitlab_git (= 7.1.0) +>>>>>>> master gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.0) gollum-lib (~> 4.0.0) |