diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-04 16:22:03 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-04 16:22:03 +0400 |
| commit | 11f864c9403e528c734d5c13a748b39733c9889e (patch) | |
| tree | 1f2b2f541ce16bce679fdc6e98f020726e8c88d9 /Gemfile.lock | |
| parent | 14b68586b8c2187d918a2d6c8cad51a72e2b51cd (diff) | |
Update gitlab_git and gitlab-grit gem versions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 009edd3ea3c..da06b476db9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,7 +50,7 @@ GEM rake (>= 0.8.7) arel (4.0.2) asciidoctor (0.1.4) - atomic (1.1.14) + atomic (1.1.16) awesome_print (1.2.0) axiom-types (0.0.5) descendants_tracker (~> 0.0.1) @@ -178,22 +178,22 @@ GEM stringex (~> 1.5.1) gitlab-grack (2.0.0.pre) rack (~> 1.5.1) - gitlab-grit (2.6.4) - charlock_holmes (~> 0.6.9) + gitlab-grit (2.6.5) + charlock_holmes (~> 0.6) diff-lcs (~> 1.1) mime-types (~> 1.15) - posix-spawn (~> 0.3.6) + posix-spawn (~> 0.3) gitlab-linguist (3.0.0) charlock_holmes (~> 0.6.6) escape_utils (~> 0.2.4) mime-types (~> 1.19) gitlab_emoji (0.0.1.1) emoji (~> 1.0.1) - gitlab_git (5.7.1) - activesupport (~> 4.0.0) - charlock_holmes (~> 0.6.9) - gitlab-grit (~> 2.6.1) - gitlab-linguist (~> 3.0.0) + gitlab_git (5.8.0) + activesupport (~> 4.0) + charlock_holmes (~> 0.6) + gitlab-grit (~> 2.6) + gitlab-linguist (~> 3.0) rugged (~> 0.19.0) gitlab_meta (6.0) gitlab_omniauth-ldap (1.0.4) @@ -285,7 +285,7 @@ GEM method_source (0.8.2) mime-types (1.25.1) minitest (4.7.5) - multi_json (1.8.4) + multi_json (1.9.2) multi_xml (0.5.5) multipart-post (1.2.0) mysql2 (0.3.11) @@ -507,8 +507,8 @@ GEM eventmachine (>= 1.0.0) rack (>= 1.0.0) thor (0.18.1) - thread_safe (0.1.3) - atomic + thread_safe (0.3.1) + atomic (>= 1.1.7, < 2) tilt (1.4.1) timers (1.1.0) tinder (1.9.3) @@ -530,7 +530,7 @@ GEM eventmachine (>= 0.12.8) http_parser.rb (~> 0.5.1) simple_oauth (~> 0.1.4) - tzinfo (0.3.38) + tzinfo (0.3.39) uglifier (2.3.2) execjs (>= 0.3.0) json (>= 1.8.0) @@ -593,7 +593,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.0.pre) gitlab-linguist (~> 3.0.0) gitlab_emoji (~> 0.0.1.1) - gitlab_git (~> 5.7.1) + gitlab_git (~> 5.8) gitlab_meta (= 6.0) gitlab_omniauth-ldap (= 1.0.4) gon (~> 5.0.0) |