Commit dde28795 authored by Aleksei Kvitinskii's avatar Aleksei Kvitinskii

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

parents cee93250 1477a6c8
v 1.1.0 v 1.1.0
- project dashboard
- wall redesigned
- feature: code snippets - feature: code snippets
- fixed horizontal scroll on file preview - fixed horizontal scroll on file preview
- fixed app crash if commit message has invalid chars - fixed app crash if commit message has invalid chars
......
...@@ -15,7 +15,7 @@ gem 'therubyracer' ...@@ -15,7 +15,7 @@ gem 'therubyracer'
gem 'faker' gem 'faker'
gem 'seed-fu', :git => 'git://github.com/mbleigh/seed-fu.git' gem 'seed-fu', :git => 'git://github.com/mbleigh/seed-fu.git'
gem "inifile" gem "inifile"
gem "albino", :git => "git://github.com/gitlabhq/albino.git" gem "pygments.rb", "0.2.3"
gem "kaminari" gem "kaminari"
gem "thin" gem "thin"
gem "git" gem "git"
......
...@@ -4,13 +4,6 @@ GIT ...@@ -4,13 +4,6 @@ GIT
specs: specs:
annotate (2.4.1.beta1) 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 GIT
remote: git://github.com/gitlabhq/grit.git remote: git://github.com/gitlabhq/grit.git
revision: ff015074ef35bd94cba943f9c0f98e161ab5851c revision: ff015074ef35bd94cba943f9c0f98e161ab5851c
...@@ -72,6 +65,7 @@ GEM ...@@ -72,6 +65,7 @@ GEM
ZenTest (= 4.5) ZenTest (= 4.5)
awesome_print (0.4.0) awesome_print (0.4.0)
bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1)
blankslate (2.1.2.4)
builder (3.0.0) builder (3.0.0)
capybara (1.0.1) capybara (1.0.1)
mime-types (>= 1.16) mime-types (>= 1.16)
...@@ -138,6 +132,8 @@ GEM ...@@ -138,6 +132,8 @@ GEM
orm_adapter (0.0.5) orm_adapter (0.0.5)
polyglot (0.3.2) polyglot (0.3.2)
posix-spawn (0.3.6) posix-spawn (0.3.6)
pygments.rb (0.2.3)
rubypython (>= 0.5.1)
rack (1.3.2) rack (1.3.2)
rack-cache (1.0.3) rack-cache (1.0.3)
rack (>= 0.4) rack (>= 0.4)
...@@ -189,6 +185,9 @@ GEM ...@@ -189,6 +185,9 @@ GEM
ruby-debug-base19 (>= 0.11.19) ruby-debug-base19 (>= 0.11.19)
ruby_core_source (0.1.5) ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2) archive-tar-minitar (>= 0.5.2)
rubypython (0.5.1)
blankslate (>= 2.1.2.3)
ffi (~> 1.0.7)
rubyzip (0.9.4) rubyzip (0.9.4)
sass (3.1.7) sass (3.1.7)
sass-rails (3.1.1) sass-rails (3.1.1)
...@@ -242,7 +241,6 @@ PLATFORMS ...@@ -242,7 +241,6 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
acts_as_list acts_as_list
albino!
annotate! annotate!
autotest autotest
autotest-rails autotest-rails
...@@ -260,6 +258,7 @@ DEPENDENCIES ...@@ -260,6 +258,7 @@ DEPENDENCIES
jquery-rails jquery-rails
kaminari kaminari
launchy launchy
pygments.rb (= 0.2.3)
rails (= 3.1.0) rails (= 3.1.0)
rails-footnotes (>= 3.7.5.rc4) rails-footnotes (>= 3.7.5.rc4)
rspec-rails rspec-rails
......
...@@ -60,24 +60,21 @@ class ProjectsController < ApplicationController ...@@ -60,24 +60,21 @@ class ProjectsController < ApplicationController
end end
def show def show
if @project.repo_exists? return render "projects/empty" unless @project.repo_exists?
@date = case params[:view] @date = case params[:view]
when "week" then Date.today - 7.days when "week" then Date.today - 7.days
else Date.today when "day" then Date.today
end.at_beginning_of_day else nil
end
@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
if @date
@date = @date.at_beginning_of_day
@commits = @project.commits_since(@date)
@messages = project.notes.since(@date).order("created_at DESC") @messages = project.notes.since(@date).order("created_at DESC")
else else
return render "projects/empty" @commits = @project.fresh_commits
@messages = project.notes.fresh.limit(10)
end end
end end
...@@ -86,15 +83,15 @@ class ProjectsController < ApplicationController ...@@ -86,15 +83,15 @@ class ProjectsController < ApplicationController
# #
def wall 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 @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 end
# #
......
...@@ -53,25 +53,4 @@ module ApplicationHelper ...@@ -53,25 +53,4 @@ module ApplicationHelper
[projects, default_nav, project_nav].flatten.to_json [projects, default_nav, project_nav].flatten.to_json
end 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 end
...@@ -24,6 +24,7 @@ class Note < ActiveRecord::Base ...@@ -24,6 +24,7 @@ class Note < ActiveRecord::Base
scope :last_week, where("created_at >= :date", :date => (Date.today - 7.days)) scope :last_week, where("created_at >= :date", :date => (Date.today - 7.days))
scope :since, lambda { |day| where("created_at >= :date", :date => (day)) } scope :since, lambda { |day| where("created_at >= :date", :date => (day)) }
scope :fresh, order("created_at DESC")
mount_uploader :attachment, AttachmentUploader mount_uploader :attachment, AttachmentUploader
end end
......
...@@ -126,6 +126,34 @@ class Project < ActiveRecord::Base ...@@ -126,6 +126,34 @@ class Project < ActiveRecord::Base
end end
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) def tree(fcommit, path = nil)
fcommit = commit if fcommit == :head fcommit = commit if fcommit == :head
tree = fcommit.tree tree = fcommit.tree
......
class Snippet < ActiveRecord::Base class Snippet < ActiveRecord::Base
include Utils::Colorize
belongs_to :project belongs_to :project
belongs_to :author, :class_name => "User" belongs_to :author, :class_name => "User"
has_many :notes, :as => :noteable has_many :notes, :as => :noteable
...@@ -28,6 +30,10 @@ class Snippet < ActiveRecord::Base ...@@ -28,6 +30,10 @@ class Snippet < ActiveRecord::Base
".js", ".sh", ".coffee", ".yml", ".md" ".js", ".sh", ".coffee", ".yml", ".md"
] ]
end end
def colorize
system_colorize(content, file_name)
end
end end
# == Schema Information # == Schema Information
# #
......
- require "utils"
.file_stats .file_stats
- @commit.diffs.each do |diff| - @commit.diffs.each do |diff|
- if diff.deleted_file - if diff.deleted_file
...@@ -35,7 +34,7 @@ ...@@ -35,7 +34,7 @@
%strong{:id => "#{diff.b_path}"}= diff.b_path %strong{:id => "#{diff.b_path}"}= diff.b_path
%br/ %br/
.diff_file_content .diff_file_content
- if file.mime_type =~ /application|text/ && !Utils.binary?(file.data) - if file.text?
- lines_arr = diff.diff.lines.to_a - lines_arr = diff.diff.lines.to_a
- line_old = lines_arr[2].match(/-(\d)/)[0].to_i.abs rescue 0 - 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 - line_new = lines_arr[2].match(/\+(\d)/)[0].to_i.abs rescue 0
...@@ -50,9 +49,9 @@ ...@@ -50,9 +49,9 @@
- else - else
- line_new += 1 - line_new += 1
- line_old += 1 - line_old += 1
- elsif file.mime_type =~ /image/ - elsif file.image?
.diff_file_content_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 - else
%p %p
%center No preview for this file type %center No preview for this file type
- require "utils" :css
.view_file .view_file
.view_file_header .view_file_header
%strong %strong
...@@ -6,14 +6,13 @@ ...@@ -6,14 +6,13 @@
= link_to "raw", blob_project_path(@project, :commit_id => @commit.id, :path => params[:path] ), :class => "right", :target => "_blank" = 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;" = link_to "history", project_commits_path(@project, :path => params[:path]), :class => "right", :style => "margin-right:10px;"
%br/ %br/
- if file.mime_type =~ /application|text/ && !Utils.binary?(file.data) - if file.text?
.view_file_content .view_file_content
- ft = handle_file_type(file.name, file.mime_type)
:erb :erb
<%= raw Albino.colorize(content, ft, :html, 'utf-8', "linenos=True") %> <%= raw file.colorize %>
- elsif file.mime_type =~ /image/ - elsif file.image?
.view_file_content_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 - else
%p %p
%center No preview for this file type %center No preview for this file type
......
<% bash_lexer = Pygments::Lexer[:bash] %>
<div class=""> <div class="">
<div class="git-empty"> <div class="git-empty">
<h2>Git global setup:</h2> <h2>Git global setup:</h2>
...@@ -6,7 +7,7 @@ git config --global user.name "#{current_user.name}" ...@@ -6,7 +7,7 @@ git config --global user.name "#{current_user.name}"
git config --global user.email "#{current_user.email}" git config --global user.email "#{current_user.email}"
eos eos
%> %>
<%= raw Albino.colorize(setup_str, :bash) %> <%= raw bash_lexer.highlight(setup_str) %>
<br /> <br />
<br /> <br />
<h2>Next steps:</h2> <h2>Next steps:</h2>
...@@ -21,7 +22,7 @@ git remote add origin #{@project.url_to_repo} ...@@ -21,7 +22,7 @@ git remote add origin #{@project.url_to_repo}
git push -u origin master git push -u origin master
eos eos
%> %>
<%= raw Albino.colorize(repo_setup_str, :bash) %> <%= raw bash_lexer.highlight(repo_setup_str) %>
<br /><br /> <br /><br />
<h2>Existing Git Repo?</h2> <h2>Existing Git Repo?</h2>
...@@ -31,7 +32,7 @@ git remote add origin #{@project.url_to_repo} ...@@ -31,7 +32,7 @@ git remote add origin #{@project.url_to_repo}
git push -u origin master git push -u origin master
eos eos
%> %>
<%= raw Albino.colorize(exist_repo_setup_str, :bash) %> <%= raw bash_lexer.highlight(exist_repo_setup_str) %>
<br /><br /> <br /><br />
<h2>Remove this project?</h2> <h2>Remove this project?</h2>
......
%div %div
%h2.left Recent history %h2.left History
.right .right
= form_tag project_path(@project), :method => :get do = form_tag project_path(@project), :method => :get do
.span-2 .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" = label_tag "day_view","Today"
.span-2 .span-2
= radio_button_tag :view, "week", params[:view] == "week", :onclick => "this.form.submit()", :id => "week_view" = radio_button_tag :view, "week", params[:view] == "week", :onclick => "this.form.submit()", :id => "week_view"
......
...@@ -4,7 +4,10 @@ ...@@ -4,7 +4,10 @@
.right .right
= form_tag wall_project_path(@project), :method => :get do = form_tag wall_project_path(@project), :method => :get do
.span-2 .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" = label_tag "day_view","Today"
.span-2 .span-2
= radio_button_tag :view, "week", params[:view] == "week", :onclick => "this.form.submit()", :id => "week_view" = radio_button_tag :view, "week", params[:view] == "week", :onclick => "this.form.submit()", :id => "week_view"
......
...@@ -7,9 +7,8 @@ ...@@ -7,9 +7,8 @@
= @snippet.file_name = @snippet.file_name
%br/ %br/
.view_file_content .view_file_content
- ft = handle_file_type(@snippet.file_name)
:erb :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 - if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
= link_to 'Edit', edit_project_snippet_path(@project, @snippet), :class => "lbutton positive" = link_to 'Edit', edit_project_snippet_path(@project, @snippet), :class => "lbutton positive"
......
require 'grit'
require 'pygments'
require "utils"
Grit::Blob.class_eval do
include Utils::FileHelper
include Utils::Colorize
end
module Utils module Utils
def self.binary?(string) module FileHelper
string.each_byte do |x| def binary?(string)
x.nonzero? or return true 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 end
false
end end
end end
...@@ -73,7 +73,7 @@ describe "Projects" do ...@@ -73,7 +73,7 @@ describe "Projects" do
end end
it "should beahave like dashboard" do it "should beahave like dashboard" do
page.should have_content("Recent history") page.should have_content("History")
end end
end end
......
...@@ -19,8 +19,8 @@ env = if envs.include?(ARGV[0]) ...@@ -19,8 +19,8 @@ env = if envs.include?(ARGV[0])
puts yellow "== RAILS ENV | #{env}" puts yellow "== RAILS ENV | #{env}"
current_version = version current_version = version
puts yellow "Your version is #{current_version}" puts yellow "Your version is #{current_version}"
puts yellow "Check for new version: $ git pull origin" puts yellow "Check for new version: $ git pull origin 1x"
`git pull origin` # pull from origin `git pull origin 1x` # pull from origin
# latest version # latest version
if version == current_version if version == current_version
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment