diff options
| -rw-r--r-- | Gemfile | 8 | ||||
| -rw-r--r-- | Gemfile.lock | 34 | ||||
| -rw-r--r-- | spec/helpers/gitlab_markdown_helper_spec.rb | 4 |
3 files changed, 19 insertions, 27 deletions
@@ -23,15 +23,19 @@ gem 'omniauth-github' # GITLAB patched libs gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837" -gem "pygments.rb", :git => "https://github.com/gitlabhq/pygments.rb.git", :ref => "2cada028da5054616634a1d9ca6941b65b3ce188" gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git", :ref => "f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e" gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git" gem 'grack', :git => "https://github.com/gitlabhq/grack.git" -gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git" # Gitolite client (for work with gitolite-admin repo) gem "gitolite", '1.1.0' +# Syntax highlighter +gem "pygments.rb", "0.3.1" + +# Language detection +gem "github-linguist", "~> 2.3.4" , :require => "linguist" + # API gem "grape", "~> 0.2.1" 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) diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb index a6708a7acd6..ec830e40ecd 100644 --- a/spec/helpers/gitlab_markdown_helper_spec.rb +++ b/spec/helpers/gitlab_markdown_helper_spec.rb @@ -329,9 +329,9 @@ describe GitlabMarkdownHelper do end it "should leave code blocks untouched" do - markdown("\n some code from $#{snippet.id}\n here too\n").should == "<div class=\"highlight\"><pre><span class=\"n\">some</span> <span class=\"n\">code</span> <span class=\"n\">from</span> $#{snippet.id}\n<span class=\"n\">here</span> <span class=\"n\">too</span>\n</pre>\n</div>\n" + markdown("\n some code from $#{snippet.id}\n here too\n").should == "<div class=\"highlight\"><pre><span class=\"n\">some</span> <span class=\"n\">code</span> <span class=\"n\">from</span> $#{snippet.id}\n<span class=\"n\">here</span> <span class=\"n\">too</span>\n</pre></div>" - markdown("\n```\nsome code from $#{snippet.id}\nhere too\n```\n").should == "<div class=\"highlight\"><pre><span class=\"n\">some</span> <span class=\"n\">code</span> <span class=\"n\">from</span> $#{snippet.id}\n<span class=\"n\">here</span> <span class=\"n\">too</span>\n</pre>\n</div>\n" + markdown("\n```\nsome code from $#{snippet.id}\nhere too\n```\n").should == "<div class=\"highlight\"><pre><span class=\"n\">some</span> <span class=\"n\">code</span> <span class=\"n\">from</span> $#{snippet.id}\n<span class=\"n\">here</span> <span class=\"n\">too</span>\n</pre></div>" end it "should leave inline code untouched" do |