Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-11-25 14:32:47 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-11-25 17:02:25 +0400
commit426bce65cf06990429d2d0ccb28ab854a02a837b (patch)
tree35277e41d7ac3920f8ca05ab629c8ee0f40c8d02 /Gemfile.lock
parent48dd07edbabaa349f55ca403cc157b8cfd155000 (diff)
New gem versions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock38
1 files changed, 18 insertions, 20 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 4be72d2fbc6..033b147a9ba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -116,7 +116,7 @@ GEM
enumerize (0.6.1)
activesupport (>= 3.2)
erubis (2.7.0)
- escape_utils (0.2.4)
+ escape_utils (0.3.2)
eventmachine (1.0.3)
excon (0.13.4)
execjs (1.4.0)
@@ -151,22 +151,17 @@ GEM
fssm (0.2.10)
gemoji (1.2.1)
gherkin-ruby (0.3.0)
- github-linguist (2.3.4)
- charlock_holmes (~> 0.6.6)
- escape_utils (~> 0.2.3)
- mime-types (~> 1.19)
- pygments.rb (>= 0.2.13)
- github-markdown (0.5.3)
+ github-markdown (0.5.5)
github-markup (0.7.5)
gitlab-flowdock-git-hook (0.4.2.2)
gitlab-grit (>= 2.4.1)
multi_json
- gitlab-gollum-lib (1.0.1)
+ gitlab-gollum-lib (1.0.2)
github-markdown (~> 0.5.3)
github-markup (>= 0.7.5, < 1.0.0)
- gitlab-grit (>= 2.5.1)
+ gitlab-grit (~> 2.6.1)
+ gitlab-pygments.rb (~> 0.5.4)
nokogiri (~> 1.5.9)
- pygments.rb (~> 0.4.2)
sanitize (~> 2.0.3)
stringex (~> 1.5.1)
gitlab-grack (1.0.1)
@@ -176,13 +171,19 @@ GEM
diff-lcs (~> 1.1)
mime-types (~> 1.15)
posix-spawn (~> 0.3.6)
- gitlab-pygments.rb (0.3.2)
+ gitlab-linguist (2.9.5)
+ charlock_holmes (~> 0.6.6)
+ escape_utils (~> 0.3.1)
+ gitlab-pygments.rb (~> 0.5.4)
+ mime-types (~> 1.19)
+ gitlab-pygments.rb (0.5.4)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
- gitlab_git (3.0.0.rc2)
+ gitlab_git (3.1.0)
activesupport (~> 3.2.13)
- github-linguist (~> 2.3.4)
gitlab-grit (~> 2.6.1)
+ gitlab-linguist (~> 2.9.5)
+ gitlab-pygments.rb (~> 0.5.4)
gitlab_meta (6.0)
gitlab_omniauth-ldap (1.0.3)
net-ldap (~> 0.3.1)
@@ -325,9 +326,6 @@ GEM
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
- pygments.rb (0.4.2)
- posix-spawn (~> 0.3.6)
- yajl-ruby (~> 1.1.0)
pyu-ruby-sasl (0.0.3.3)
quiet_assets (1.0.2)
railties (>= 3.1, < 5.0)
@@ -575,13 +573,13 @@ DEPENDENCIES
font-awesome-rails
foreman
gemoji (~> 1.2.1)
- github-linguist
github-markup (~> 0.7.4)
gitlab-flowdock-git-hook (~> 0.4.2)
- gitlab-gollum-lib (~> 1.0.1)
+ gitlab-gollum-lib (~> 1.0.2)
gitlab-grack (~> 1.0.1)
- gitlab-pygments.rb (~> 0.3.2)
- gitlab_git (~> 3.0.0.rc2)
+ gitlab-linguist (~> 2.9.5)
+ gitlab-pygments.rb (~> 0.5.4)
+ gitlab_git (~> 3.1.0)
gitlab_meta (= 6.0)
gitlab_omniauth-ldap (= 1.0.3)
gon