diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-04-21 01:26:22 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-04-21 01:26:22 +0300 |
| commit | 9c76bd95402dfb4fa49cca4876c9714f408c5122 (patch) | |
| tree | 05f47f10550e10d52dde2ed94c705c27b63ee7b8 | |
| parent | 5b6019f357d01d7871068da15549d19be1a0cf4f (diff) | |
| download | gitlab-ce-9c76bd95402dfb4fa49cca4876c9714f408c5122.tar.gz | |
Project linguist integration
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | app/models/snippet.rb | 18 | ||||
| -rw-r--r-- | app/models/tree.rb | 2 | ||||
| -rw-r--r-- | config/initializers/gitlabhq/20_grit_ext.rb | 1 |
5 files changed, 20 insertions, 7 deletions
@@ -19,7 +19,7 @@ gem "therubyracer" gem "faker" gem "seed-fu" gem "linguist", "~> 1.0.0", :git => "https://github.com/github/linguist.git" -gem "pygments.rb", "0.2.7" +gem "pygments.rb", "0.2.11" gem "thin" gem "unicorn" gem "git" diff --git a/Gemfile.lock b/Gemfile.lock index 221e81474ba..c852a8bd420 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -180,7 +180,7 @@ GEM coderay (~> 1.0.5) method_source (~> 0.7) slop (>= 2.4.4, < 3) - pygments.rb (0.2.7) + pygments.rb (0.2.11) rubypython (~> 0.5.3) pyu-ruby-sasl (0.0.3.3) rack (1.4.1) @@ -342,7 +342,7 @@ DEPENDENCIES mysql2 omniauth-ldap pry - pygments.rb (= 0.2.7) + pygments.rb (= 0.2.11) rails (= 3.2.1) rails-footnotes rake diff --git a/app/models/snippet.rb b/app/models/snippet.rb index ae25e8a3bb8..17d23418556 100644 --- a/app/models/snippet.rb +++ b/app/models/snippet.rb @@ -1,5 +1,5 @@ class Snippet < ActiveRecord::Base - include Utils::Colorize + include Linguist::BlobHelper belongs_to :project belongs_to :author, :class_name => "User" @@ -38,8 +38,20 @@ class Snippet < ActiveRecord::Base ] end - def colorize - system_colorize(content, file_name) + def data + content + end + + def size + 0 + end + + def name + file_name + end + + def mode + nil end def expired? diff --git a/app/models/tree.rb b/app/models/tree.rb index 6040680b969..9d60f83015f 100644 --- a/app/models/tree.rb +++ b/app/models/tree.rb @@ -1,5 +1,5 @@ class Tree - include Utils::FileHelper + include Linguist::BlobHelper attr_accessor :path, :tree, :project, :ref delegate :contents, diff --git a/config/initializers/gitlabhq/20_grit_ext.rb b/config/initializers/gitlabhq/20_grit_ext.rb index 4c6be1e489f..13e692cf20d 100644 --- a/config/initializers/gitlabhq/20_grit_ext.rb +++ b/config/initializers/gitlabhq/20_grit_ext.rb @@ -1,4 +1,5 @@ require 'grit' +require 'pygments' Grit::Blob.class_eval do include Linguist::BlobHelper |