diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-30 21:31:10 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-30 21:31:10 +0200 |
| commit | 74f1da10d1e6923c347426de9603df7bd8919e09 (patch) | |
| tree | f391b16a36dcb9eeb0095261488d2b95fa3b6649 /Gemfile.lock | |
| parent | 397543480298ed24e5f9656e8f7b8142f8b54f0f (diff) | |
| download | gitlab-ce-74f1da10d1e6923c347426de9603df7bd8919e09.tar.gz | |
Use linguist from rubygems
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ae6e6b52d04..c5963f34266 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,16 +5,6 @@ GIT specs: github-markup (0.7.6) -GIT - remote: https://gitlab.com/gitlab-org/linguist.git - revision: b337f7013333863503a8a7894cceb568478fda66 - ref: b337f7013333863503a8a7894cceb568478fda66 - specs: - gitlab-linguist (2.9.6) - charlock_holmes (~> 0.6.6) - escape_utils (~> 0.2.4) - mime-types (~> 1.19) - GEM remote: https://rubygems.org/ specs: @@ -182,10 +172,14 @@ GEM diff-lcs (~> 1.1) mime-types (~> 1.15) posix-spawn (~> 0.3.6) - gitlab_git (4.1.0) + gitlab-linguist (3.0.0) + charlock_holmes (~> 0.6.6) + escape_utils (~> 0.2.4) + mime-types (~> 1.19) + gitlab_git (5.0.0) activesupport (~> 4.0.0) gitlab-grit (~> 2.6.1) - gitlab-linguist (~> 2.9.5) + gitlab-linguist (~> 3.0.0) gitlab_meta (6.0) gitlab_omniauth-ldap (1.0.3) net-ldap (~> 0.3.1) @@ -579,8 +573,8 @@ DEPENDENCIES gitlab-flowdock-git-hook (~> 0.4.2) gitlab-gollum-lib (~> 1.1.0) gitlab-grack (~> 2.0.0.pre) - gitlab-linguist (~> 2.9.6)! - gitlab_git (~> 4.1.0) + gitlab-linguist (~> 3.0.0) + gitlab_git (~> 5.0.0) gitlab_meta (= 6.0) gitlab_omniauth-ldap (= 1.0.3) gon (~> 5.0.0) |