diff options
| author | Valeriy Sizov <vsv2711@gmail.com> | 2012-10-02 16:29:03 +0300 |
|---|---|---|
| committer | Valeriy Sizov <vsv2711@gmail.com> | 2012-10-02 16:29:03 +0300 |
| commit | c4883ca225d1f4934cec737769fe22588b2bc8a8 (patch) | |
| tree | ae1725cb98586391700ce9216c130412b8952adf /Gemfile.lock | |
| parent | 339555846e2ddc6606bddeb2590a92f5d882e33c (diff) | |
| download | gitlab-ce-c4883ca225d1f4934cec737769fe22588b2bc8a8.tar.gz | |
Update linguist and pygments #1602
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f4d8e386bdb..3c3bea9d7ca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,16 +22,6 @@ GIT posix-spawn (~> 0.3.6) GIT - remote: https://github.com/gitlabhq/linguist.git - revision: c3d6fc5af8cf9d67afa572bba363bf0db256a900 - specs: - linguist (1.0.0) - charlock_holmes (~> 0.6.6) - escape_utils (~> 0.2.3) - mime-types (~> 1.18) - pygments.rb (~> 0.2.11) - -GIT remote: https://github.com/gitlabhq/omniauth-ldap.git revision: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e ref: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e @@ -43,14 +33,6 @@ GIT rubyntlm (~> 0.1.1) GIT - remote: https://github.com/gitlabhq/pygments.rb.git - revision: 2cada028da5054616634a1d9ca6941b65b3ce188 - ref: 2cada028da5054616634a1d9ca6941b65b3ce188 - specs: - pygments.rb (0.2.13) - rubypython (~> 0.6.1) - -GIT remote: https://github.com/gitlabhq/yaml_db.git revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd specs: @@ -157,6 +139,11 @@ GEM thor (>= 0.13.6) gherkin-ruby (0.2.1) git (1.2.5) + 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-markup (0.7.4) gitlab_meta (2.9) gitolite (1.1.0) @@ -264,6 +251,9 @@ GEM coderay (~> 1.0.5) method_source (~> 0.7.1) slop (>= 2.4.4, < 3) + pygments.rb (0.3.1) + posix-spawn (~> 0.3.6) + yajl-ruby (~> 1.1.0) pyu-ruby-sasl (0.0.3.3) rack (1.4.1) rack-cache (1.2) @@ -330,9 +320,6 @@ GEM railties (>= 3.0) rspec (~> 2.10.0) rubyntlm (0.1.1) - rubypython (0.6.2) - blankslate (>= 2.1.2.3) - ffi (~> 1.0.7) rubyzip (0.9.8) sass (3.1.19) sass-rails (3.2.5) @@ -403,6 +390,7 @@ GEM crack (>= 0.1.7) xpath (0.1.4) nokogiri (~> 1.3) + yajl-ruby (1.1.0) PLATFORMS ruby @@ -427,6 +415,7 @@ DEPENDENCIES ffaker foreman git + github-linguist (~> 2.3.4) github-markup (~> 0.7.4) gitlab_meta (= 2.9) gitolite (= 1.1.0) @@ -445,7 +434,6 @@ DEPENDENCIES kaminari launchy letter_opener - linguist (~> 1.0.0)! modernizr (= 2.5.3) mysql2 omniauth @@ -454,7 +442,7 @@ DEPENDENCIES omniauth-ldap! omniauth-twitter pry - pygments.rb! + pygments.rb (= 0.3.1) rack-mini-profiler rails (= 3.2.8) raphael-rails (= 1.5.2) |