diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-30 19:14:27 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-30 19:14:27 +0300 |
| commit | a54f2d512a84a328ef4dfb1a3d8a1915579b8bfc (patch) | |
| tree | 516eaeb744e15c556e706a5a20ffd4cd2df479e6 /Gemfile.lock | |
| parent | f438bd415ffc4405c2e81360a92ffaf907cd87ad (diff) | |
| download | gitlab-ce-a54f2d512a84a328ef4dfb1a3d8a1915579b8bfc.tar.gz | |
Update gitlab_git version
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 2ced4eef514..369be882e14 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -147,17 +147,17 @@ GEM pygments.rb (>= 0.2.13) github-markdown (0.5.3) github-markup (0.7.5) - gitlab-gollum-lib (1.0.0) + gitlab-gollum-lib (1.0.1) github-markdown (~> 0.5.3) github-markup (>= 0.7.5, < 1.0.0) - gitlab-grit (~> 2.5.1) + gitlab-grit (>= 2.5.1) nokogiri (~> 1.5.9) pygments.rb (~> 0.4.2) sanitize (~> 2.0.3) stringex (~> 1.5.1) gitlab-grack (1.0.1) rack (~> 1.4.1) - gitlab-grit (2.5.1) + gitlab-grit (2.6.0) charlock_holmes (~> 0.6.9) diff-lcs (~> 1.1) mime-types (~> 1.15) @@ -165,10 +165,10 @@ GEM gitlab-pygments.rb (0.3.2) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) - gitlab_git (1.3.0) + gitlab_git (1.4.1) activesupport (~> 3.2.13) github-linguist (~> 2.3.4) - gitlab-grit (~> 2.5.1) + gitlab-grit (~> 2.6.0) gitlab_meta (6.0) gitlab_omniauth-ldap (1.0.3) net-ldap (~> 0.3.1) @@ -543,10 +543,10 @@ DEPENDENCIES gemoji (~> 1.2.1) github-linguist github-markup (~> 0.7.4) - gitlab-gollum-lib (~> 1.0.0) + gitlab-gollum-lib (~> 1.0.1) gitlab-grack (~> 1.0.1) gitlab-pygments.rb (~> 0.3.2) - gitlab_git (~> 1.3.0) + gitlab_git (~> 1.4.1) gitlab_meta (= 6.0) gitlab_omniauth-ldap (= 1.0.3) gon |