Merge branch 'master' of dev.gitlabhq.com:gitlabhq

Aleksei Kvitinskii
2 parents cee93250 1477a6c8
Showing 19 changed files with 147 additions and 80 deletions Show diff stats
CHANGELOG
Gemfile
Gemfile.lock
VERSION
app/controllers/projects_controller.rb
app/helpers/application_helper.rb
app/models/note.rb
app/models/project.rb
app/models/snippet.rb
app/views/commits/_diff.html.haml
app/views/projects/_tree_file.html.haml
app/views/projects/empty.html.erb
app/views/projects/show.html.haml
app/views/projects/wall.html.haml
app/views/snippets/show.html.haml
config/initializers/grit_ext.rb
lib/utils.rb
spec/requests/projects_spec.rb
update.rb
 v 1.1.0
+  - project dashboard
+  - wall redesigned
   - feature: code snippets
   - fixed horizontal scroll on file preview
   - fixed app crash if commit message has invalid chars
@@ -15,7 +15,7 @@ gem &#39;therubyracer&#39;
 gem 'faker'
 gem 'seed-fu', :git => 'git://github.com/mbleigh/seed-fu.git'
 gem "inifile"
-gem "albino", :git => "git://github.com/gitlabhq/albino.git"
+gem "pygments.rb", "0.2.3"
 gem "kaminari"
 gem "thin"
 gem "git"
@@ -5,13 +5,6 @@ GIT
     annotate (2.4.1.beta1)
  
 GIT
-  remote: git://github.com/gitlabhq/albino.git
-  revision: 118380924969f3a856659f86ea1f40c1ba7bfcb1
-  specs:
-    albino (1.3.3)
-      posix-spawn (>= 0.3.6)
-
-GIT
   remote: git://github.com/gitlabhq/grit.git
   revision: ff015074ef35bd94cba943f9c0f98e161ab5851c
   specs:
@@ -72,6 +65,7 @@ GEM
       ZenTest (= 4.5)
     awesome_print (0.4.0)
     bcrypt-ruby (3.0.1)
+    blankslate (2.1.2.4)
     builder (3.0.0)
     capybara (1.0.1)
       mime-types (>= 1.16)
@@ -138,6 +132,8 @@ GEM
     orm_adapter (0.0.5)
     polyglot (0.3.2)
     posix-spawn (0.3.6)
+    pygments.rb (0.2.3)
+      rubypython (>= 0.5.1)
     rack (1.3.2)
     rack-cache (1.0.3)
       rack (>= 0.4)
@@ -189,6 +185,9 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
+    rubypython (0.5.1)
+      blankslate (>= 2.1.2.3)
+      ffi (~> 1.0.7)
     rubyzip (0.9.4)
     sass (3.1.7)
     sass-rails (3.1.1)
@@ -242,7 +241,6 @@ PLATFORMS
  
 DEPENDENCIES
   acts_as_list
-  albino!
   annotate!
   autotest
   autotest-rails
@@ -260,6 +258,7 @@ DEPENDENCIES
   jquery-rails
   kaminari
   launchy
+  pygments.rb (= 0.2.3)
   rails (= 3.1.0)
   rails-footnotes (>= 3.7.5.rc4)
   rspec-rails
-1.0.2
+1.1.0
@@ -60,24 +60,21 @@ class ProjectsController &lt; ApplicationController
   end
  
   def show
-    if @project.repo_exists?
-      @date = case params[:view]
-              when "week" then Date.today - 7.days
-              else Date.today
-              end.at_beginning_of_day
-
-      @heads = @project.repo.heads
-      @commits = @heads.map do |h| 
-        @project.repo.log(h.name, nil, :since => @date)
-      end.flatten.uniq { |c| c.id }
-
-      @commits.sort! do |x, y|
-        y.committed_date <=> x.committed_date
-      end
+    return render "projects/empty" unless @project.repo_exists?
+    @date = case params[:view]
+            when "week" then Date.today - 7.days
+            when "day" then Date.today
+            else nil
+            end
  
+    if @date
+      @date = @date.at_beginning_of_day
+
+      @commits = @project.commits_since(@date)
       @messages = project.notes.since(@date).order("created_at DESC")
-    else 
-      return render "projects/empty"
+    else
+      @commits = @project.fresh_commits
+      @messages = project.notes.fresh.limit(10)
     end
   end
  
@@ -86,15 +83,15 @@ class ProjectsController &lt; ApplicationController
   #
  
   def wall
-    @date = case params[:view]
-            when "week" then Date.today - 7.days
-            when "all" then nil
-            else Date.today
-            end
-
-    @notes = @project.common_notes.order("created_at DESC")
-    @notes = @notes.since(@date.at_beginning_of_day) if @date
     @note = Note.new
+    @notes = @project.common_notes.order("created_at DESC")
+
+    @notes = case params[:view]
+             when "week" then @notes.since((Date.today - 7.days).at_beginning_of_day)
+             when "all" then @notes.all
+             when "day" then @notes.since(Date.today.at_beginning_of_day)
+             else @notes.fresh.limit(10)
+             end
   end
  
   #
@@ -53,25 +53,4 @@ module ApplicationHelper
     [projects, default_nav, project_nav].flatten.to_json
   end
  
-  def handle_file_type(file_name, mime_type = nil)
-    if file_name =~ /(\.rb|\.ru|\.rake|Rakefile|\.gemspec|\.rbx|Gemfile)$/
-      :ruby
-    elsif file_name =~ /\.py$/
-      :python
-    elsif file_name =~ /(\.pl|\.scala|\.c|\.cpp|\.java|\.haml|\.html|\.sass|\.scss|\.xml|\.php|\.erb)$/
-      $1[1..-1].to_sym
-    elsif file_name =~ /\.js$/
-      :javascript
-    elsif file_name =~ /\.sh$/
-      :bash
-    elsif file_name =~ /\.coffee$/
-      :coffeescript
-    elsif file_name =~ /\.yml$/
-      :yaml
-    elsif file_name =~ /\.md$/
-      :minid
-    else
-      :text
-    end
-  end
 end
@@ -24,6 +24,7 @@ class Note &lt; ActiveRecord::Base
  
   scope :last_week, where("created_at  >= :date", :date => (Date.today - 7.days))
   scope :since, lambda { |day| where("created_at  >= :date", :date => (day)) }
+  scope :fresh, order("created_at DESC")
  
   mount_uploader :attachment, AttachmentUploader
 end
@@ -126,6 +126,34 @@ class Project &lt; ActiveRecord::Base
     end
   end
  
+  def heads 
+    @heads ||= repo.heads
+  end
+
+  def fresh_commits
+    commits = heads.map do |h| 
+      repo.commits(h.name, 10)
+    end.flatten.uniq { |c| c.id }
+
+    commits.sort! do |x, y|
+      y.committed_date <=> x.committed_date
+    end
+
+    commits[0..10]
+  end
+
+  def commits_since(date)
+    commits = heads.map do |h| 
+      repo.log(h.name, nil, :since => date)
+    end.flatten.uniq { |c| c.id }
+
+    commits.sort! do |x, y|
+      y.committed_date <=> x.committed_date
+    end
+
+    commits
+  end
+
   def tree(fcommit, path = nil)
     fcommit = commit if fcommit == :head
     tree = fcommit.tree
 class Snippet < ActiveRecord::Base
+  include Utils::Colorize
+
   belongs_to :project
   belongs_to :author, :class_name => "User"
   has_many :notes, :as => :noteable
@@ -28,6 +30,10 @@ class Snippet &lt; ActiveRecord::Base
       ".js", ".sh", ".coffee", ".yml", ".md"
     ]
   end
+
+  def colorize
+    system_colorize(content, file_name)
+  end
 end
 # == Schema Information
 #
-- require "utils"
 .file_stats
   - @commit.diffs.each do |diff|
     - if diff.deleted_file
@@ -35,7 +34,7 @@
         %strong{:id => "#{diff.b_path}"}= diff.b_path
       %br/
     .diff_file_content
-      - if file.mime_type =~ /application|text/ && !Utils.binary?(file.data)
+      - if file.text?
         - lines_arr = diff.diff.lines.to_a
         - line_old = lines_arr[2].match(/-(\d)/)[0].to_i.abs rescue 0
         - line_new = lines_arr[2].match(/\+(\d)/)[0].to_i.abs rescue 0
@@ -50,9 +49,9 @@
           - else 
             - line_new += 1
             - line_old += 1
-      - elsif file.mime_type =~ /image/
+      - elsif file.image?
         .diff_file_content_image
-          %img{:src => "data:image/jpeg;base64,#{Base64.encode64(file.data)}"}
+          %img{:src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
       - else
         %p 
           %center No preview for this file type
-- require "utils"
+:css
 .view_file
   .view_file_header
     %strong
@@ -6,14 +6,13 @@
       = link_to "raw", blob_project_path(@project, :commit_id => @commit.id, :path => params[:path] ), :class => "right", :target => "_blank"
       = link_to "history", project_commits_path(@project, :path => params[:path]), :class => "right", :style => "margin-right:10px;"
       %br/
-  - if file.mime_type =~ /application|text/ && !Utils.binary?(file.data)
+  - if file.text?
     .view_file_content
-      - ft = handle_file_type(file.name, file.mime_type)
       :erb
-        <%= raw Albino.colorize(content, ft, :html, 'utf-8', "linenos=True") %>
-  - elsif file.mime_type =~ /image/
+        <%= raw file.colorize %>
+  - elsif file.image?
     .view_file_content_image
-      %img{ :src => "data:image/jpeg;base64,#{Base64.encode64(file.data)}"}
+      %img{ :src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
   - else
     %p 
       %center No preview for this file type
+<% bash_lexer = Pygments::Lexer[:bash] %>
 <div class="">
   <div class="git-empty">
     <h2>Git global setup:</h2>
@@ -6,7 +7,7 @@ git config --global user.name &quot;#{current_user.name}&quot;
 git config --global user.email  "#{current_user.email}"
 eos
 %>
-    <%= raw Albino.colorize(setup_str, :bash) %>
+    <%= raw bash_lexer.highlight(setup_str) %>
     <br />
     <br />
     <h2>Next steps:</h2>
@@ -21,7 +22,7 @@ git remote add origin #{@project.url_to_repo}
 git push -u origin master
 eos
 %>
-    <%= raw Albino.colorize(repo_setup_str, :bash) %>
+    <%= raw bash_lexer.highlight(repo_setup_str) %>
  
     <br /><br />
     <h2>Existing Git Repo?</h2>
@@ -31,7 +32,7 @@ git remote add origin   #{@project.url_to_repo}
 git push -u origin master
 eos
 %>
-    <%= raw Albino.colorize(exist_repo_setup_str, :bash) %>
+    <%= raw bash_lexer.highlight(exist_repo_setup_str) %>
  
     <br /><br />
     <h2>Remove this project?</h2>
 %div
-  %h2.left Recent history
+  %h2.left History
   .right
     = form_tag project_path(@project), :method => :get do
       .span-2
-        = radio_button_tag :view, "day", (params[:view] || "day") == "day", :onclick => "this.form.submit()", :id => "day_view"
+        = radio_button_tag :view, "recent", (params[:view] || "recent") == "recent", :onclick => "this.form.submit()", :id => "recent_view"
+        = label_tag "recent_view","Recent"
+      .span-2
+        = radio_button_tag :view, "day", params[:view] == "day", :onclick => "this.form.submit()", :id => "day_view"
         = label_tag "day_view","Today"
       .span-2
         = radio_button_tag :view, "week", params[:view] == "week", :onclick => "this.form.submit()", :id => "week_view"
@@ -4,7 +4,10 @@
   .right
     = form_tag wall_project_path(@project), :method => :get do
       .span-2
-        = radio_button_tag :view, "day", (params[:view] || "day") == "day", :onclick => "this.form.submit()", :id => "day_view"
+        = radio_button_tag :view, "recent", (params[:view] || "recent") == "recent", :onclick => "this.form.submit()", :id => "recent_view"
+        = label_tag "recent_view","Recent"
+      .span-2
+        = radio_button_tag :view, "day", params[:view] == "day", :onclick => "this.form.submit()", :id => "day_view"
         = label_tag "day_view","Today"
       .span-2
         = radio_button_tag :view, "week", params[:view] == "week", :onclick => "this.form.submit()", :id => "week_view"
@@ -7,9 +7,8 @@
       = @snippet.file_name
       %br/
   .view_file_content
-    - ft = handle_file_type(@snippet.file_name)
     :erb
-      <%= raw Albino.colorize(@snippet.content, ft, :html, 'utf-8', "linenos=True") %>
+      <%= raw @snippet.colorize %>
  
 - if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
   = link_to 'Edit', edit_project_snippet_path(@project, @snippet), :class => "lbutton positive"
@@ -0,0 +1,8 @@
+require 'grit'
+require 'pygments'
+require "utils"
+
+Grit::Blob.class_eval do
+  include Utils::FileHelper
+  include Utils::Colorize
+end
 module Utils
-  def self.binary?(string) 
-    string.each_byte do |x|
-      x.nonzero? or return true 
+  module FileHelper
+    def binary?(string) 
+      string.each_byte do |x|
+        x.nonzero? or return true 
+      end
+      false
+    end
+
+    def image?
+      mime_type =~ /image/
+    end
+
+    def text?
+      mime_type =~ /application|text/ && !binary?(data)
+    end
+  end
+
+  module Colorize
+    def colorize
+      system_colorize(data, name)
+    end
+
+    def system_colorize(data, file_name)
+      ft = handle_file_type(file_name)
+      Pygments.highlight(data, :lexer => ft, :options => { :encoding => 'utf-8', :linenos => 'True' })
+    end
+
+    def handle_file_type(file_name, mime_type = nil)
+      if file_name =~ /(\.rb|\.ru|\.rake|Rakefile|\.gemspec|\.rbx|Gemfile)$/
+        :ruby
+      elsif file_name =~ /\.py$/
+        :python
+      elsif file_name =~ /(\.pl|\.scala|\.c|\.cpp|\.java|\.haml|\.html|\.sass|\.scss|\.xml|\.php|\.erb)$/
+        $1[1..-1].to_sym
+      elsif file_name =~ /\.js$/
+        :javascript
+      elsif file_name =~ /\.sh$/
+        :bash
+      elsif file_name =~ /\.coffee$/
+        :coffeescript
+      elsif file_name =~ /\.yml$/
+        :yaml
+      elsif file_name =~ /\.md$/
+        :minid
+      else
+        :text
+      end
     end
-    false
   end
 end
@@ -73,7 +73,7 @@ describe &quot;Projects&quot; do
     end
  
     it "should beahave like dashboard" do 
-      page.should have_content("Recent history")
+      page.should have_content("History")
     end
  
   end
@@ -19,8 +19,8 @@ env = if envs.include?(ARGV[0])
 puts yellow "== RAILS ENV | #{env}"
 current_version = version
 puts yellow "Your version is #{current_version}"
-puts yellow "Check for new version: $ git pull origin"
-`git pull origin` # pull from origin
+puts yellow "Check for new version: $ git pull origin 1x"
+`git pull origin 1x` # pull from origin
  
 # latest version
 if version == current_version
1	1	v 1.1.0
	2	+ - project dashboard
	3	+ - wall redesigned
2	4	- feature: code snippets
3	5	- fixed horizontal scroll on file preview
4	6	- fixed app crash if commit message has invalid chars
...	...
...	...	@@ -15,7 +15,7 @@ gem 'therubyracer'
15	15	gem 'faker'
16	16	gem 'seed-fu', :git => 'git://github.com/mbleigh/seed-fu.git'
17	17	gem "inifile"
18		-gem "albino", :git => "git://github.com/gitlabhq/albino.git"
	18	+gem "pygments.rb", "0.2.3"
19	19	gem "kaminari"
20	20	gem "thin"
21	21	gem "git"
...	...
...	...	@@ -5,13 +5,6 @@ GIT
5	5	annotate (2.4.1.beta1)
6	6
7	7	GIT
8		- remote: git://github.com/gitlabhq/albino.git
9		- revision: 118380924969f3a856659f86ea1f40c1ba7bfcb1
10		- specs:
11		- albino (1.3.3)
12		- posix-spawn (>= 0.3.6)
13		-
14		-GIT
15	8	remote: git://github.com/gitlabhq/grit.git
16	9	revision: ff015074ef35bd94cba943f9c0f98e161ab5851c
17	10	specs:
...	...	@@ -72,6 +65,7 @@ GEM
72	65	ZenTest (= 4.5)
73	66	awesome_print (0.4.0)
74	67	bcrypt-ruby (3.0.1)
	68	+ blankslate (2.1.2.4)
75	69	builder (3.0.0)
76	70	capybara (1.0.1)
77	71	mime-types (>= 1.16)
...	...	@@ -138,6 +132,8 @@ GEM
138	132	orm_adapter (0.0.5)
139	133	polyglot (0.3.2)
140	134	posix-spawn (0.3.6)
	135	+ pygments.rb (0.2.3)
	136	+ rubypython (>= 0.5.1)
141	137	rack (1.3.2)
142	138	rack-cache (1.0.3)
143	139	rack (>= 0.4)
...	...	@@ -189,6 +185,9 @@ GEM
189	185	ruby-debug-base19 (>= 0.11.19)
190	186	ruby_core_source (0.1.5)
191	187	archive-tar-minitar (>= 0.5.2)
	188	+ rubypython (0.5.1)
	189	+ blankslate (>= 2.1.2.3)
	190	+ ffi (~> 1.0.7)
192	191	rubyzip (0.9.4)
193	192	sass (3.1.7)
194	193	sass-rails (3.1.1)
...	...	@@ -242,7 +241,6 @@ PLATFORMS
242	241
243	242	DEPENDENCIES
244	243	acts_as_list
245		- albino!
246	244	annotate!
247	245	autotest
248	246	autotest-rails
...	...	@@ -260,6 +258,7 @@ DEPENDENCIES
260	258	jquery-rails
261	259	kaminari
262	260	launchy
	261	+ pygments.rb (= 0.2.3)
263	262	rails (= 3.1.0)
264	263	rails-footnotes (>= 3.7.5.rc4)
265	264	rspec-rails
...	...
...	...	@@ -60,24 +60,21 @@ class ProjectsController < ApplicationController
60	60	end
61	61
62	62	def show
63		- if @project.repo_exists?
64		- @date = case params[:view]
65		- when "week" then Date.today - 7.days
66		- else Date.today
67		- end.at_beginning_of_day
68		-
69		- @heads = @project.repo.heads
70		- @commits = @heads.map do \|h\|
71		- @project.repo.log(h.name, nil, :since => @date)
72		- end.flatten.uniq { \|c\| c.id }
73		-
74		- @commits.sort! do \|x, y\|
75		- y.committed_date <=> x.committed_date
76		- end
	63	+ return render "projects/empty" unless @project.repo_exists?
	64	+ @date = case params[:view]
	65	+ when "week" then Date.today - 7.days
	66	+ when "day" then Date.today
	67	+ else nil
	68	+ end
77	69
	70	+ if @date
	71	+ @date = @date.at_beginning_of_day
	72	+
	73	+ @commits = @project.commits_since(@date)
78	74	@messages = project.notes.since(@date).order("created_at DESC")
79		- else
80		- return render "projects/empty"
	75	+ else
	76	+ @commits = @project.fresh_commits
	77	+ @messages = project.notes.fresh.limit(10)
81	78	end
82	79	end
83	80
...	...	@@ -86,15 +83,15 @@ class ProjectsController < ApplicationController
86	83	#
87	84
88	85	def wall
89		- @date = case params[:view]
90		- when "week" then Date.today - 7.days
91		- when "all" then nil
92		- else Date.today
93		- end
94		-
95		- @notes = @project.common_notes.order("created_at DESC")
96		- @notes = @notes.since(@date.at_beginning_of_day) if @date
97	86	@note = Note.new
	87	+ @notes = @project.common_notes.order("created_at DESC")
	88	+
	89	+ @notes = case params[:view]
	90	+ when "week" then @notes.since((Date.today - 7.days).at_beginning_of_day)
	91	+ when "all" then @notes.all
	92	+ when "day" then @notes.since(Date.today.at_beginning_of_day)
	93	+ else @notes.fresh.limit(10)
	94	+ end
98	95	end
99	96
100	97	#
...	...
...	...	@@ -53,25 +53,4 @@ module ApplicationHelper
53	53	[projects, default_nav, project_nav].flatten.to_json
54	54	end
55	55
56		- def handle_file_type(file_name, mime_type = nil)
57		- if file_name =~ /(\.rb\|\.ru\|\.rake\|Rakefile\|\.gemspec\|\.rbx\|Gemfile)$/
58		- :ruby
59		- elsif file_name =~ /\.py$/
60		- :python
61		- elsif file_name =~ /(\.pl\|\.scala\|\.c\|\.cpp\|\.java\|\.haml\|\.html\|\.sass\|\.scss\|\.xml\|\.php\|\.erb)$/
62		- $1[1..-1].to_sym
63		- elsif file_name =~ /\.js$/
64		- :javascript
65		- elsif file_name =~ /\.sh$/
66		- :bash
67		- elsif file_name =~ /\.coffee$/
68		- :coffeescript
69		- elsif file_name =~ /\.yml$/
70		- :yaml
71		- elsif file_name =~ /\.md$/
72		- :minid
73		- else
74		- :text
75		- end
76		- end
77	56	end
...	...
...	...	@@ -24,6 +24,7 @@ class Note < ActiveRecord::Base
24	24
25	25	scope :last_week, where("created_at >= :date", :date => (Date.today - 7.days))
26	26	scope :since, lambda { \|day\| where("created_at >= :date", :date => (day)) }
	27	+ scope :fresh, order("created_at DESC")
27	28
28	29	mount_uploader :attachment, AttachmentUploader
29	30	end
...	...
...	...	@@ -126,6 +126,34 @@ class Project < ActiveRecord::Base
126	126	end
127	127	end
128	128
	129	+ def heads
	130	+ @heads \|\|= repo.heads
	131	+ end
	132	+
	133	+ def fresh_commits
	134	+ commits = heads.map do \|h\|
	135	+ repo.commits(h.name, 10)
	136	+ end.flatten.uniq { \|c\| c.id }
	137	+
	138	+ commits.sort! do \|x, y\|
	139	+ y.committed_date <=> x.committed_date
	140	+ end
	141	+
	142	+ commits[0..10]
	143	+ end
	144	+
	145	+ def commits_since(date)
	146	+ commits = heads.map do \|h\|
	147	+ repo.log(h.name, nil, :since => date)
	148	+ end.flatten.uniq { \|c\| c.id }
	149	+
	150	+ commits.sort! do \|x, y\|
	151	+ y.committed_date <=> x.committed_date
	152	+ end
	153	+
	154	+ commits
	155	+ end
	156	+
129	157	def tree(fcommit, path = nil)
130	158	fcommit = commit if fcommit == :head
131	159	tree = fcommit.tree
...	...
1	1	class Snippet < ActiveRecord::Base
	2	+ include Utils::Colorize
	3	+
2	4	belongs_to :project
3	5	belongs_to :author, :class_name => "User"
4	6	has_many :notes, :as => :noteable
...	...	@@ -28,6 +30,10 @@ class Snippet < ActiveRecord::Base
28	30	".js", ".sh", ".coffee", ".yml", ".md"
29	31	]
30	32	end
	33	+
	34	+ def colorize
	35	+ system_colorize(content, file_name)
	36	+ end
31	37	end
32	38	# == Schema Information
33	39	#
...	...
1		-- require "utils"
2	1	.file_stats
3	2	- @commit.diffs.each do \|diff\|
4	3	- if diff.deleted_file
...	...	@@ -35,7 +34,7 @@
35	34	%strong{:id => "#{diff.b_path}"}= diff.b_path
36	35	%br/
37	36	.diff_file_content
38		- - if file.mime_type =~ /application\|text/ && !Utils.binary?(file.data)
	37	+ - if file.text?
39	38	- lines_arr = diff.diff.lines.to_a
40	39	- line_old = lines_arr[2].match(/-(\d)/)[0].to_i.abs rescue 0
41	40	- line_new = lines_arr[2].match(/\+(\d)/)[0].to_i.abs rescue 0
...	...	@@ -50,9 +49,9 @@
50	49	- else
51	50	- line_new += 1
52	51	- line_old += 1
53		- - elsif file.mime_type =~ /image/
	52	+ - elsif file.image?
54	53	.diff_file_content_image
55		- %img{:src => "data:image/jpeg;base64,#{Base64.encode64(file.data)}"}
	54	+ %img{:src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
56	55	- else
57	56	%p
58	57	%center No preview for this file type
...	...
1		-- require "utils"
	1	+:css
2	2	.view_file
3	3	.view_file_header
4	4	%strong
...	...	@@ -6,14 +6,13 @@
6	6	= link_to "raw", blob_project_path(@project, :commit_id => @commit.id, :path => params[:path] ), :class => "right", :target => "_blank"
7	7	= link_to "history", project_commits_path(@project, :path => params[:path]), :class => "right", :style => "margin-right:10px;"
8	8	%br/
9		- - if file.mime_type =~ /application\|text/ && !Utils.binary?(file.data)
	9	+ - if file.text?
10	10	.view_file_content
11		- - ft = handle_file_type(file.name, file.mime_type)
12	11	:erb
13		- <%= raw Albino.colorize(content, ft, :html, 'utf-8', "linenos=True") %>
14		- - elsif file.mime_type =~ /image/
	12	+ <%= raw file.colorize %>
	13	+ - elsif file.image?
15	14	.view_file_content_image
16		- %img{ :src => "data:image/jpeg;base64,#{Base64.encode64(file.data)}"}
	15	+ %img{ :src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
17	16	- else
18	17	%p
19	18	%center No preview for this file type
...	...