Merge branch 'feature/search_issues' into develop
This commit is contained in:
commit
7087e11f1d
51 changed files with 500 additions and 136 deletions
|
@ -1,4 +1,6 @@
|
||||||
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
|
||||||
|
|
3
Gemfile
3
Gemfile
|
@ -15,11 +15,12 @@ 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"
|
||||||
gem "acts_as_list"
|
gem "acts_as_list"
|
||||||
|
gem "mysql2"
|
||||||
|
|
||||||
group :assets do
|
group :assets do
|
||||||
gem 'sass-rails', " ~> 3.1.0"
|
gem 'sass-rails', " ~> 3.1.0"
|
||||||
|
|
17
Gemfile.lock
17
Gemfile.lock
|
@ -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
|
||||||
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)
|
||||||
|
@ -134,10 +128,13 @@ GEM
|
||||||
treetop (~> 1.4.8)
|
treetop (~> 1.4.8)
|
||||||
mime-types (1.16)
|
mime-types (1.16)
|
||||||
multi_json (1.0.3)
|
multi_json (1.0.3)
|
||||||
|
mysql2 (0.3.7)
|
||||||
nokogiri (1.5.0)
|
nokogiri (1.5.0)
|
||||||
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 +186,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 +242,6 @@ PLATFORMS
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
acts_as_list
|
acts_as_list
|
||||||
albino!
|
|
||||||
annotate!
|
annotate!
|
||||||
autotest
|
autotest
|
||||||
autotest-rails
|
autotest-rails
|
||||||
|
@ -260,6 +259,8 @@ DEPENDENCIES
|
||||||
jquery-rails
|
jquery-rails
|
||||||
kaminari
|
kaminari
|
||||||
launchy
|
launchy
|
||||||
|
mysql2
|
||||||
|
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
|
||||||
|
|
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
||||||
1.0.2
|
1.1.0
|
||||||
|
|
|
@ -16,3 +16,7 @@ $(function(){
|
||||||
$('select#branch').selectmenu({style:'popup', width:200});
|
$('select#branch').selectmenu({style:'popup', width:200});
|
||||||
$('select#tag').selectmenu({style:'popup', width:200});
|
$('select#tag').selectmenu({style:'popup', width:200});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function updatePage(){
|
||||||
|
$.ajax({type: "GET", url: location.href, dataType: "script"});
|
||||||
|
}
|
||||||
|
|
|
@ -491,8 +491,14 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
|
||||||
background: white;
|
background: white;
|
||||||
}
|
}
|
||||||
p {
|
p {
|
||||||
margin-bottom: 3px;
|
margin-bottom: 4px;
|
||||||
font-size: 12px;
|
font-size: 13px;
|
||||||
|
color:#111;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
cite {
|
||||||
|
&.ago {
|
||||||
|
color:#666;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -515,7 +521,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
|
||||||
}
|
}
|
||||||
.note_content {
|
.note_content {
|
||||||
float:left;
|
float:left;
|
||||||
width:750px;
|
width:650px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.issue_notes {
|
.issue_notes {
|
||||||
|
@ -557,21 +563,78 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
|
||||||
img {
|
img {
|
||||||
padding-right:10px;
|
padding-right:10px;
|
||||||
}
|
}
|
||||||
background: #fff !important;
|
|
||||||
background: -webkit-gradient(linear,left top,left bottom,from(#fff),to(#EAEAEA)) !important;
|
|
||||||
background: -moz-linear-gradient(top,#fff,#EAEAEA) !important;
|
|
||||||
background: transparent 9 !important;
|
|
||||||
|
|
||||||
float: left;
|
float: left;
|
||||||
margin: 0 20px 20px 0px;
|
margin: 0 20px 20px 0px;
|
||||||
padding: 5px 5px;;
|
padding: 5px 0px;;
|
||||||
width: 420px;
|
width: 420px;
|
||||||
|
|
||||||
|
&.dash_wall{
|
||||||
|
border-bottom: 2px solid orange;
|
||||||
|
span {
|
||||||
|
background: orange;
|
||||||
|
color:black;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&.dash_issue{
|
||||||
|
border-bottom: 2px solid #ffbbbb;
|
||||||
|
span {
|
||||||
|
background: #ffbbbb;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
&.dash_commit{
|
||||||
|
border-bottom: 2px solid #bbbbff;
|
||||||
|
|
||||||
|
span{
|
||||||
|
background: #bbbbff;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&.dash_snippet{
|
||||||
|
border-bottom: 2px solid #bbffbb;
|
||||||
|
|
||||||
|
span{
|
||||||
|
background: #bbffbb;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
span{
|
||||||
|
border: 1px solid #aaa;
|
||||||
|
color:black;
|
||||||
|
padding:1px 4px;
|
||||||
|
}
|
||||||
|
|
||||||
h4 {
|
h4 {
|
||||||
margin-bottom:3px;
|
margin-bottom:3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
span {
|
}
|
||||||
|
.commit,
|
||||||
|
.message,
|
||||||
|
#notes-list{
|
||||||
|
.author {
|
||||||
|
background: #eaeaea;
|
||||||
|
color: #333;
|
||||||
|
border: 1px solid #aaa;
|
||||||
|
padding:1px 2px;
|
||||||
|
margin-right:5px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Note textare */
|
||||||
|
#note_note {
|
||||||
|
height:100px;
|
||||||
|
width:97%;
|
||||||
|
font-size:14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.wall_page {
|
||||||
|
#note_note {
|
||||||
|
height:25px;
|
||||||
|
}
|
||||||
|
.attach_holder {
|
||||||
|
display:none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -78,6 +78,13 @@ class IssuesController < ApplicationController
|
||||||
render :nothing => true
|
render :nothing => true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def search
|
||||||
|
@project = Project.find(params['project'])
|
||||||
|
@issues = @project.issues.where("title LIKE ? OR content LIKE ?", "%#{params['terms']}%", "%#{params['terms']}%")
|
||||||
|
|
||||||
|
render :partial => 'issues'
|
||||||
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
def issue
|
def issue
|
||||||
|
|
|
@ -3,6 +3,12 @@ class ProfileController < ApplicationController
|
||||||
@user = current_user
|
@user = current_user
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def social_update
|
||||||
|
@user = current_user
|
||||||
|
@user.update_attributes(params[:user])
|
||||||
|
redirect_to [:profile]
|
||||||
|
end
|
||||||
|
|
||||||
def password
|
def password
|
||||||
@user = current_user
|
@user = current_user
|
||||||
end
|
end
|
||||||
|
|
|
@ -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
|
||||||
|
else nil
|
||||||
end
|
end
|
||||||
|
|
||||||
@heads = @project.repo.heads
|
if @date
|
||||||
@commits = @heads.map do |h|
|
@date = @date.at_beginning_of_day
|
||||||
@project.repo.log(h.name, nil, :since => @date - 1.day)
|
|
||||||
end.flatten.uniq { |c| c.id }
|
|
||||||
|
|
||||||
@commits.sort! do |x, y|
|
@commits = @project.commits_since(@date)
|
||||||
y.committed_date <=> x.committed_date
|
@messages = project.notes.since(@date).order("created_at DESC")
|
||||||
end
|
|
||||||
|
|
||||||
@messages = project.notes.since(@date).limit(40).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,8 +83,15 @@ class ProjectsController < ApplicationController
|
||||||
#
|
#
|
||||||
|
|
||||||
def wall
|
def wall
|
||||||
@notes = @project.common_notes
|
|
||||||
@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
|
||||||
[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
|
||||||
|
|
|
@ -8,6 +8,7 @@ module ProjectsHelper
|
||||||
case type
|
case type
|
||||||
when "Issue" then @project.issues.find(id)
|
when "Issue" then @project.issues.find(id)
|
||||||
when "Commit" then @project.repo.commits(id).first
|
when "Commit" then @project.repo.commits(id).first
|
||||||
|
when "Snippet" then @project.snippets.find(id)
|
||||||
else
|
else
|
||||||
true
|
true
|
||||||
end
|
end
|
||||||
|
|
|
@ -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
|
||||||
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
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
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
|
||||||
".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
|
||||||
#
|
#
|
||||||
|
|
|
@ -5,7 +5,8 @@ class User < ActiveRecord::Base
|
||||||
:recoverable, :rememberable, :trackable, :validatable
|
:recoverable, :rememberable, :trackable, :validatable
|
||||||
|
|
||||||
# Setup accessible (or protected) attributes for your model
|
# Setup accessible (or protected) attributes for your model
|
||||||
attr_accessible :email, :password, :password_confirmation, :remember_me, :name, :projects_limit
|
attr_accessible :email, :password, :password_confirmation, :remember_me,
|
||||||
|
:name, :projects_limit, :skype, :linkedin, :twitter
|
||||||
|
|
||||||
has_many :users_projects, :dependent => :destroy
|
has_many :users_projects, :dependent => :destroy
|
||||||
has_many :projects, :through => :users_projects
|
has_many :projects, :through => :users_projects
|
||||||
|
@ -58,5 +59,8 @@ end
|
||||||
# name :string(255)
|
# name :string(255)
|
||||||
# admin :boolean default(FALSE), not null
|
# admin :boolean default(FALSE), not null
|
||||||
# projects_limit :integer
|
# projects_limit :integer
|
||||||
|
# skype :string
|
||||||
|
# linkedin :string
|
||||||
|
# twitter :string
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
|
@ -25,13 +25,26 @@
|
||||||
= f.label :password_confirmation
|
= f.label :password_confirmation
|
||||||
%br
|
%br
|
||||||
= f.password_field :password_confirmation
|
= f.password_field :password_confirmation
|
||||||
.span-11
|
.field.prepend-top
|
||||||
.field.prepend-top.append-bottom
|
|
||||||
= f.check_box :admin
|
= f.check_box :admin
|
||||||
= f.label :admin
|
= f.label :admin
|
||||||
|
.span-11
|
||||||
.field.prepend-top
|
.field.prepend-top
|
||||||
= f.text_field :projects_limit, :class => "small_input"
|
= f.text_field :projects_limit, :class => "small_input"
|
||||||
= f.label :projects_limit
|
= f.label :projects_limit
|
||||||
|
|
||||||
|
.field
|
||||||
|
= f.label :skype
|
||||||
|
%br
|
||||||
|
= f.text_field :skype
|
||||||
|
.field
|
||||||
|
= f.label :linkedin
|
||||||
|
%br
|
||||||
|
= f.text_field :linkedin
|
||||||
|
.field
|
||||||
|
= f.label :twitter
|
||||||
|
%br
|
||||||
|
= f.text_field :twitter
|
||||||
.clear
|
.clear
|
||||||
%br
|
%br
|
||||||
.actions
|
.actions
|
||||||
|
|
|
@ -14,6 +14,17 @@
|
||||||
%b Projects limit:
|
%b Projects limit:
|
||||||
= @admin_user.projects_limit
|
= @admin_user.projects_limit
|
||||||
|
|
||||||
|
%p
|
||||||
|
%b Skype:
|
||||||
|
= @admin_user.skype
|
||||||
|
%p
|
||||||
|
%b LinkedIn:
|
||||||
|
= @admin_user.linkedin
|
||||||
|
%p
|
||||||
|
%b Twitter:
|
||||||
|
= @admin_user.twitter
|
||||||
|
|
||||||
|
|
||||||
.clear
|
.clear
|
||||||
= link_to 'Edit', edit_admin_user_path(@admin_user)
|
= link_to 'Edit', edit_admin_user_path(@admin_user)
|
||||||
\|
|
\|
|
||||||
|
|
|
@ -15,8 +15,8 @@
|
||||||
= link_to "Browse Code", tree_project_path(@project, :commit_id => commit.id), :class => "lite_button", :style => "float:right"
|
= link_to "Browse Code", tree_project_path(@project, :commit_id => commit.id), :class => "lite_button", :style => "float:right"
|
||||||
= link_to truncate(commit.id.to_s, :length => 16), project_commit_path(@project, :id => commit.id), :class => "lite_button", :style => "width:120px;float:right"
|
= link_to truncate(commit.id.to_s, :length => 16), project_commit_path(@project, :id => commit.id), :class => "lite_button", :style => "width:120px;float:right"
|
||||||
%span
|
%span
|
||||||
%span
|
%span.author
|
||||||
[ #{commit.author} ]
|
= commit.author
|
||||||
= time_ago_in_words(commit.committed_date)
|
= time_ago_in_words(commit.committed_date)
|
||||||
ago
|
ago
|
||||||
= more_commits_link if @commits.size > 99
|
= more_commits_link if @commits.size > 99
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
- 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 @@
|
||||||
%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 @@
|
||||||
- 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
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
:plain
|
-#:plain
|
||||||
$("#side-commit-preview").remove();
|
$("#side-commit-preview").remove();
|
||||||
var side = $("<div id='side-commit-preview'></div>");
|
var side = $("<div id='side-commit-preview'></div>");
|
||||||
side.html("#{escape_javascript(render "commits/show")}");
|
side.html("#{escape_javascript(render "commits/show")}");
|
||||||
$("##{dom_id(@project)}").parent().append(side);
|
$("##{dom_id(@project)}").parent().append(side);
|
||||||
$("##{dom_id(@project)}").addClass("span-14");
|
$("##{dom_id(@project)}").addClass("span-14");
|
||||||
|
:plain
|
||||||
|
$("#notes-list").html("#{escape_javascript(render(:partial => 'notes/notes_list'))}");
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
%div
|
%div
|
||||||
- if can? current_user, :write_issue, @project
|
- if can? current_user, :write_issue, @project
|
||||||
.left= link_to 'New Issue', new_project_issue_path(@project), :remote => true, :class => "lbutton vm"
|
.left
|
||||||
|
= form_tag search_project_issues_path(@project), :method => :get, :remote => true do
|
||||||
|
= search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
|
||||||
|
= link_to 'New Issue', new_project_issue_path(@project), :remote => true, :class => "lbutton vm"
|
||||||
|
|
||||||
.right
|
.right
|
||||||
= form_tag project_issues_path(@project), :method => :get do
|
= form_tag project_issues_path(@project), :method => :get do
|
||||||
.span-2
|
.span-2
|
||||||
|
@ -20,6 +24,18 @@
|
||||||
#issues-table-holder= render "issues"
|
#issues-table-holder= render "issues"
|
||||||
%br
|
%br
|
||||||
:javascript
|
:javascript
|
||||||
|
$('.issue_search').keyup(function() {
|
||||||
|
var terms = $(this).val();
|
||||||
|
var project_id = 1;
|
||||||
|
|
||||||
|
if (terms.length >= 2) {
|
||||||
|
$.get($(this).parent().attr('action'), { 'terms': terms, project: project_id }, function(response) {
|
||||||
|
$('#issues-table').html(response);
|
||||||
|
setSortable();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
$('.delete-issue').live('ajax:success', function() {
|
$('.delete-issue').live('ajax:success', function() {
|
||||||
$(this).closest('tr').fadeOut(); });
|
$(this).closest('tr').fadeOut(); });
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,9 @@
|
||||||
= f.label :note
|
= f.label :note
|
||||||
%cite (255 symbols only)
|
%cite (255 symbols only)
|
||||||
%br
|
%br
|
||||||
= f.text_area :note, :style => "width:97%;height:100px", :size => 255
|
= f.text_area :note, :size => 255
|
||||||
|
|
||||||
%div
|
%div.attach_holder
|
||||||
= f.label :attachment
|
= f.label :attachment
|
||||||
%cite (less than 10 MB)
|
%cite (less than 10 MB)
|
||||||
%br
|
%br
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
%ul#notes-list= render "notes/notes_list"
|
- if controller.action_name == "wall"
|
||||||
|
%ul#notes-list= render "notes/notes_list"
|
||||||
|
|
||||||
%br
|
- else
|
||||||
%br
|
%ul#notes-list= render "notes/notes_list"
|
||||||
- if can? current_user, :write_note, @project
|
%br
|
||||||
|
%br
|
||||||
|
- if can? current_user, :write_note, @project
|
||||||
= render "notes/form"
|
= render "notes/form"
|
||||||
|
|
||||||
:javascript
|
:javascript
|
||||||
|
@ -23,7 +26,3 @@
|
||||||
$(function(){
|
$(function(){
|
||||||
var int =self.setInterval("updatePage()", 20000);
|
var int =self.setInterval("updatePage()", 20000);
|
||||||
});
|
});
|
||||||
|
|
||||||
function updatePage(){
|
|
||||||
$.ajax({type: "GET", url: location.href, dataType: "script"});
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,16 +1,14 @@
|
||||||
%li{:id => dom_id(note)}
|
%li{:id => dom_id(note)}
|
||||||
%div.note_author
|
%div.note_author
|
||||||
= image_tag gravatar_icon(note.author.email), :class => "left", :width => 40, :style => "padding-right:5px;"
|
= image_tag gravatar_icon(note.author.email), :class => "left", :width => 40, :style => "padding-right:5px;"
|
||||||
%div.note_content
|
%div.note_content.left
|
||||||
= simple_format(html_escape(note.note))
|
= simple_format(html_escape(note.note))
|
||||||
- if note.attachment.url
|
- if note.attachment.url
|
||||||
Attachment:
|
Attachment:
|
||||||
= link_to note.attachment_identifier, note.attachment.url
|
= link_to note.attachment_identifier, note.attachment.url, :target => "_blank"
|
||||||
%br
|
%br
|
||||||
%span
|
%span.author= note.author.name
|
||||||
%span
|
%cite.ago
|
||||||
[ #{note.author.name} ]
|
|
||||||
|
|
||||||
= time_ago_in_words(note.updated_at)
|
= time_ago_in_words(note.updated_at)
|
||||||
ago
|
ago
|
||||||
%br
|
%br
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
- if @note.valid?
|
- if @note.valid?
|
||||||
:plain
|
:plain
|
||||||
$("#new_note .errors").remove();
|
$("#new_note .errors").remove();
|
||||||
$("#notes-list").append("#{escape_javascript(render(:partial => 'show', :locals => {:note => @note} ))}");
|
updatePage();
|
||||||
$('#note_note').val("");
|
$('#note_note').val("");
|
||||||
- else
|
- else
|
||||||
:plain
|
:plain
|
||||||
|
|
|
@ -6,3 +6,28 @@
|
||||||
%p
|
%p
|
||||||
%b Email:
|
%b Email:
|
||||||
= @user.email
|
= @user.email
|
||||||
|
|
||||||
|
%br
|
||||||
|
|
||||||
|
= form_for @user, :url => profile_edit_path, :method => :put do |f|
|
||||||
|
-if @user.errors.any?
|
||||||
|
#error_explanation
|
||||||
|
%ul
|
||||||
|
- @user.errors.full_messages.each do |msg|
|
||||||
|
%li= msg
|
||||||
|
|
||||||
|
.div
|
||||||
|
= f.label :skype
|
||||||
|
%br
|
||||||
|
= f.text_field :skype
|
||||||
|
.div
|
||||||
|
= f.label :linkedin
|
||||||
|
%br
|
||||||
|
= f.text_field :linkedin
|
||||||
|
.div
|
||||||
|
= f.label :twitter
|
||||||
|
%br
|
||||||
|
= f.text_field :twitter
|
||||||
|
.actions
|
||||||
|
= f.submit 'Save', :class => "lbutton vm"
|
||||||
|
|
||||||
|
|
|
@ -9,8 +9,8 @@
|
||||||
= link_to truncate_commit_message(commit, 60), project_commit_path(@project, :id => commit.id)
|
= link_to truncate_commit_message(commit, 60), project_commit_path(@project, :id => commit.id)
|
||||||
|
|
||||||
%span
|
%span
|
||||||
%span
|
%span.author
|
||||||
[ #{commit.author} ]
|
= commit.author.name.force_encoding("UTF-8")
|
||||||
%cite
|
%cite
|
||||||
= time_ago_in_words(commit.committed_date)
|
= time_ago_in_words(commit.committed_date)
|
||||||
ago
|
ago
|
||||||
|
|
|
@ -5,21 +5,29 @@
|
||||||
|
|
||||||
- case type
|
- case type
|
||||||
- when "Issue"
|
- when "Issue"
|
||||||
|
- css_class = "dash_issue"
|
||||||
- issue = parent
|
- issue = parent
|
||||||
- item_code = issue.author.email
|
- item_code = issue.author.email
|
||||||
- link_item_name = truncate(issue.title, :length => 50)
|
- link_item_name = truncate(issue.title, :length => 50)
|
||||||
- link_to_item = project_issue_path(@project, issue)
|
- link_to_item = project_issue_path(@project, issue)
|
||||||
|
- when "Snippet"
|
||||||
|
- css_class = "dash_snippet"
|
||||||
|
- item_code = parent.author.email
|
||||||
|
- link_item_name = parent.title
|
||||||
|
- link_to_item = project_snippet_path(@project, parent)
|
||||||
- when "Commit"
|
- when "Commit"
|
||||||
|
- css_class = "dash_commit"
|
||||||
- commit = parent
|
- commit = parent
|
||||||
- item_code = commit.author.email
|
- item_code = commit.author.email
|
||||||
- link_item_name = truncate_commit_message(commit, 50)
|
- link_item_name = truncate_commit_message(commit, 50)
|
||||||
- link_to_item = project_commit_path(@project, :id => commit.id)
|
- link_to_item = project_commit_path(@project, :id => commit.id)
|
||||||
- else
|
- else
|
||||||
|
- css_class = "dash_wall"
|
||||||
- item_code = @project.name
|
- item_code = @project.name
|
||||||
- link_item_name = "Project Wall"
|
- link_item_name = "Project Wall"
|
||||||
- link_to_item = wall_project_path(@project)
|
- link_to_item = wall_project_path(@project)
|
||||||
|
|
||||||
%div.recent_message_parent
|
%div{ :class => "recent_message_parent #{css_class}"}
|
||||||
= image_tag gravatar_icon(item_code), :class => "left", :width => 40
|
= image_tag gravatar_icon(item_code), :class => "left", :width => 40
|
||||||
%h4
|
%h4
|
||||||
= link_to(link_item_name, link_to_item)
|
= link_to(link_item_name, link_to_item)
|
||||||
|
@ -30,18 +38,14 @@
|
||||||
%div.message
|
%div.message
|
||||||
= image_tag gravatar_icon(note.author.email), :class => "left", :width => 24, :style => "padding-right:5px;"
|
= image_tag gravatar_icon(note.author.email), :class => "left", :width => 24, :style => "padding-right:5px;"
|
||||||
%p{:style => "margin-bottom: 3px;"}
|
%p{:style => "margin-bottom: 3px;"}
|
||||||
= link_to truncate(note.note, :length => 50), "#"
|
%span.author
|
||||||
|
= note.author.name
|
||||||
|
= link_to truncate(note.note, :length => 200), link_to_item + "#note_#{note.id}"
|
||||||
- if note.attachment.url
|
- if note.attachment.url
|
||||||
%br
|
%br
|
||||||
Attachment:
|
Attachment:
|
||||||
= link_to note.attachment_identifier, note.attachment.url
|
= link_to note.attachment_identifier, note.attachment.url
|
||||||
%br
|
%br
|
||||||
%span
|
|
||||||
%span
|
|
||||||
[ #{note.author.name} ]
|
|
||||||
%cite
|
|
||||||
= time_ago_in_words(note.created_at)
|
|
||||||
ago
|
|
||||||
%br
|
%br
|
||||||
.append-bottom
|
.append-bottom
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
%div{ :class => "project", :url => project_path(project) }
|
%div{ :class => "project", :url => project_path(project) }
|
||||||
%h2
|
%h2
|
||||||
= image_tag gravatar_icon(project.name), :class => "left", :width => 40, :style => "padding-right:5px;"
|
= image_tag gravatar_icon(project.name), :class => "left", :width => 40, :style => "padding-right:5px;"
|
||||||
= "/" + project.code
|
= link_to ("/" + project.code), project_path(project), :style => "text-decoration:none"
|
||||||
%p= project.name
|
%p= project.name
|
||||||
%p= project.url_to_repo
|
%p= project.url_to_repo
|
||||||
-#%p
|
-#%p
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
%span= link_to "Tree", tree_project_path(@project), :class => current_page?(:controller => "projects", :action => "tree", :id => @project) ? "current" : nil
|
%span= link_to "Tree", tree_project_path(@project), :class => current_page?(:controller => "projects", :action => "tree", :id => @project) ? "current" : nil
|
||||||
%span= link_to "Commits", project_commits_path(@project), :class => current_page?(:controller => "commits", :action => "index", :project_id => @project) ? "current" : nil
|
%span= link_to "Commits", project_commits_path(@project), :class => current_page?(:controller => "commits", :action => "index", :project_id => @project) ? "current" : nil
|
||||||
%span
|
%span
|
||||||
= link_to team_project_path(@project), :class => current_page?(:controller => "projects", :action => "team", :id => @project) ? "current" : nil do
|
= link_to team_project_path(@project), :class => (current_page?(:controller => "projects", :action => "team", :id => @project) || controller.controller_name == "team_members") ? "current" : nil do
|
||||||
Team
|
Team
|
||||||
- if @project.users_projects.count > 0
|
- if @project.users_projects.count > 0
|
||||||
%span{ :class => "top_menu_count" }= @project.users_projects.count
|
%span{ :class => "top_menu_count" }= @project.users_projects.count
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
- require "utils"
|
:css
|
||||||
.view_file
|
.view_file
|
||||||
.view_file_header
|
.view_file_header
|
||||||
%strong
|
%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 "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
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
<% 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}"
|
||||||
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}
|
||||||
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}
|
||||||
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>
|
||||||
|
|
|
@ -1,10 +1,13 @@
|
||||||
%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 "day_view","Day"
|
= 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
|
.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"
|
||||||
= label_tag "week_view","Week"
|
= label_tag "week_view","Week"
|
||||||
|
@ -15,6 +18,6 @@
|
||||||
=render "projects/recent_commits"
|
=render "projects/recent_commits"
|
||||||
|
|
||||||
.span-11.right
|
.span-11.right
|
||||||
%h3 Messages
|
%h3 Talk
|
||||||
=render "projects/recent_messages"
|
=render "projects/recent_messages"
|
||||||
|
|
||||||
|
|
|
@ -1 +1,29 @@
|
||||||
|
%div.wall_page
|
||||||
|
- if can? current_user, :write_note, @project
|
||||||
|
= render "notes/form"
|
||||||
|
.right
|
||||||
|
= form_tag wall_project_path(@project), :method => :get do
|
||||||
|
.span-2
|
||||||
|
= 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"
|
||||||
|
= label_tag "week_view","Week"
|
||||||
|
.span-2
|
||||||
|
= radio_button_tag :view, "all", params[:view] == "all", :onclick => "this.form.submit()", :id => "all_view"
|
||||||
|
= label_tag "all_view","All"
|
||||||
|
.clear
|
||||||
|
%br
|
||||||
|
%hr
|
||||||
= render "notes/notes"
|
= render "notes/notes"
|
||||||
|
|
||||||
|
:javascript
|
||||||
|
$(function(){
|
||||||
|
$("#note_note").live("click", function(){
|
||||||
|
$(this).css("height", "100px");
|
||||||
|
$('.attach_holder').show();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
|
@ -7,14 +7,14 @@
|
||||||
= @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"
|
||||||
- if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
|
- if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
|
||||||
= link_to 'Destroy', [@project, @snippet], :confirm => 'Are you sure?', :method => :delete, :class => "lbutton delete-snippet negative", :id => "destroy_snippet_#{@snippet.id}"
|
= link_to 'Destroy', [@project, @snippet], :confirm => 'Are you sure?', :method => :delete, :class => "lbutton delete-snippet negative", :id => "destroy_snippet_#{@snippet.id}"
|
||||||
|
.clear
|
||||||
%br
|
%br
|
||||||
.snippet_notes= render "notes/notes"
|
.snippet_notes= render "notes/notes"
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
- user = member.user
|
- user = member.user
|
||||||
%tr{:id => dom_id(member)}
|
%tr{:id => dom_id(member)}
|
||||||
%td
|
%td
|
||||||
= image_tag gravatar_icon(user.email), :class => "left", :width => 40, :style => "padding:0 5px;"
|
= link_to image_tag(gravatar_icon(user.email), :class => "left", :width => 40, :style => "padding:0 5px;"), project_team_member_path(@project, member)
|
||||||
= truncate user.name, :lenght => 16
|
|
||||||
|
= link_to truncate(user.name, :lenght => 16), project_team_member_path(@project, member)
|
||||||
|
|
||||||
%td= truncate user.email, :lenght => 16
|
%td= truncate user.email, :lenght => 16
|
||||||
- if can? current_user, :admin_project, @project
|
- if can? current_user, :admin_project, @project
|
||||||
= form_for(member, :as => :team_member, :url => project_team_member_path(@project, member)) do |f|
|
= form_for(member, :as => :team_member, :url => project_team_member_path(@project, member)) do |f|
|
||||||
|
|
28
app/views/team_members/show.html.haml
Normal file
28
app/views/team_members/show.html.haml
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
- user = @team_member.user
|
||||||
|
.span-2
|
||||||
|
= image_tag gravatar_icon(user.email), :class => "left", :width => 60, :style => "padding-right:5px;"
|
||||||
|
%p
|
||||||
|
%b Name:
|
||||||
|
= user.name
|
||||||
|
%p
|
||||||
|
%b Email:
|
||||||
|
= user.email
|
||||||
|
|
||||||
|
%br
|
||||||
|
|
||||||
|
- unless user.skype.empty?
|
||||||
|
.div
|
||||||
|
%b Skype:
|
||||||
|
= user.skype
|
||||||
|
|
||||||
|
- unless user.linkedin.empty?
|
||||||
|
.div
|
||||||
|
%b LinkedIn:
|
||||||
|
= user.linkedin
|
||||||
|
|
||||||
|
- unless user.twitter.empty?
|
||||||
|
.div
|
||||||
|
%b Twitter:
|
||||||
|
= user.twitter
|
||||||
|
|
||||||
|
|
|
@ -4,8 +4,9 @@
|
||||||
# Ensure the SQLite 3 gem is defined in your Gemfile
|
# Ensure the SQLite 3 gem is defined in your Gemfile
|
||||||
# gem 'sqlite3'
|
# gem 'sqlite3'
|
||||||
development:
|
development:
|
||||||
adapter: sqlite3
|
adapter: mysql2
|
||||||
database: db/development.sqlite3
|
database: gitlab_development
|
||||||
|
username: root
|
||||||
pool: 5
|
pool: 5
|
||||||
timeout: 5000
|
timeout: 5000
|
||||||
|
|
||||||
|
@ -13,13 +14,11 @@ development:
|
||||||
# re-generated from your development database when you run "rake".
|
# re-generated from your development database when you run "rake".
|
||||||
# Do not set this db to the same as development or production.
|
# Do not set this db to the same as development or production.
|
||||||
test:
|
test:
|
||||||
adapter: sqlite3
|
adapter: mysql2
|
||||||
database: db/test.sqlite3
|
database: gitlab_development
|
||||||
pool: 5
|
username: root
|
||||||
timeout: 5000
|
|
||||||
|
|
||||||
production:
|
production:
|
||||||
adapter: sqlite3
|
adatper: mysql2
|
||||||
database: db/production.sqlite3
|
database: gitlab_test
|
||||||
pool: 5
|
username: root
|
||||||
timeout: 5000
|
|
||||||
|
|
8
config/initializers/grit_ext.rb
Normal file
8
config/initializers/grit_ext.rb
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
require 'grit'
|
||||||
|
require 'pygments'
|
||||||
|
require "utils"
|
||||||
|
|
||||||
|
Grit::Blob.class_eval do
|
||||||
|
include Utils::FileHelper
|
||||||
|
include Utils::Colorize
|
||||||
|
end
|
|
@ -13,6 +13,7 @@ Gitlab::Application.routes.draw do
|
||||||
get "errors/gitosis"
|
get "errors/gitosis"
|
||||||
get "profile/password", :to => "profile#password"
|
get "profile/password", :to => "profile#password"
|
||||||
put "profile/password", :to => "profile#password_update"
|
put "profile/password", :to => "profile#password_update"
|
||||||
|
put "profile/edit", :to => "profile#social_update"
|
||||||
get "profile", :to => "profile#show"
|
get "profile", :to => "profile#show"
|
||||||
#get "profile/:id", :to => "profile#show"
|
#get "profile/:id", :to => "profile#show"
|
||||||
|
|
||||||
|
@ -46,6 +47,9 @@ Gitlab::Application.routes.draw do
|
||||||
collection do
|
collection do
|
||||||
post :sort
|
post :sort
|
||||||
end
|
end
|
||||||
|
collection do
|
||||||
|
get :search
|
||||||
|
end
|
||||||
end
|
end
|
||||||
resources :notes, :only => [:create, :destroy]
|
resources :notes, :only => [:create, :destroy]
|
||||||
end
|
end
|
||||||
|
|
7
db/migrate/20111019212429_add_social_to_user.rb
Normal file
7
db/migrate/20111019212429_add_social_to_user.rb
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
class AddSocialToUser < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :users, :skype, :string
|
||||||
|
add_column :users, :linkedin, :string
|
||||||
|
add_column :users, :twitter, :string
|
||||||
|
end
|
||||||
|
end
|
14
db/migrate/20111021101550_change_social_fields_in_users.rb
Normal file
14
db/migrate/20111021101550_change_social_fields_in_users.rb
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
class ChangeSocialFieldsInUsers < ActiveRecord::Migration
|
||||||
|
def up
|
||||||
|
remove_column :users, :skype
|
||||||
|
remove_column :users, :linkedin
|
||||||
|
remove_column :users, :twitter
|
||||||
|
|
||||||
|
add_column :users, :skype, :string, {:null => false, :default => ''}
|
||||||
|
add_column :users, :linkedin, :string, {:null => false, :default => ''}
|
||||||
|
add_column :users, :twitter, :string, {:null => false, :default => ''}
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
end
|
||||||
|
end
|
|
@ -11,7 +11,7 @@
|
||||||
#
|
#
|
||||||
# It's strongly recommended to check this file into your version control system.
|
# It's strongly recommended to check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(:version => 20111016195506) do
|
ActiveRecord::Schema.define(:version => 20111021101550) do
|
||||||
|
|
||||||
create_table "issues", :force => true do |t|
|
create_table "issues", :force => true do |t|
|
||||||
t.string "title"
|
t.string "title"
|
||||||
|
@ -82,6 +82,9 @@ ActiveRecord::Schema.define(:version => 20111016195506) do
|
||||||
t.string "name"
|
t.string "name"
|
||||||
t.boolean "admin", :default => false, :null => false
|
t.boolean "admin", :default => false, :null => false
|
||||||
t.integer "projects_limit", :default => 10
|
t.integer "projects_limit", :default => 10
|
||||||
|
t.string "skype", :default => "", :null => false
|
||||||
|
t.string "linkedin", :default => "", :null => false
|
||||||
|
t.string "twitter", :default => "", :null => false
|
||||||
end
|
end
|
||||||
|
|
||||||
add_index "users", ["email"], :name => "index_users_on_email", :unique => true
|
add_index "users", ["email"], :name => "index_users_on_email", :unique => true
|
||||||
|
|
45
lib/utils.rb
45
lib/utils.rb
|
@ -1,8 +1,51 @@
|
||||||
module Utils
|
module Utils
|
||||||
def self.binary?(string)
|
module FileHelper
|
||||||
|
def binary?(string)
|
||||||
string.each_byte do |x|
|
string.each_byte do |x|
|
||||||
x.nonzero? or return true
|
x.nonzero? or return true
|
||||||
end
|
end
|
||||||
false
|
false
|
||||||
end
|
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
|
||||||
end
|
end
|
||||||
|
|
|
@ -39,5 +39,8 @@ end
|
||||||
# name :string(255)
|
# name :string(255)
|
||||||
# admin :boolean default(FALSE), not null
|
# admin :boolean default(FALSE), not null
|
||||||
# projects_limit :integer
|
# projects_limit :integer
|
||||||
|
# skype :string
|
||||||
|
# linkedin :string
|
||||||
|
# twitter :string
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
|
@ -144,4 +144,26 @@ describe "Issues" do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "Search issue", :js => true do
|
||||||
|
before do
|
||||||
|
['foobar', 'foobar2', 'gitlab'].each do |title|
|
||||||
|
@issue = Factory :issue,
|
||||||
|
:author => @user,
|
||||||
|
:assignee => @user,
|
||||||
|
:project => project,
|
||||||
|
:title => title
|
||||||
|
@issue.save
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
it "should search and return the correct results" do
|
||||||
|
visit project_issues_path(project)
|
||||||
|
fill_in "issue_search", :with => "foobar"
|
||||||
|
page.should have_content 'foobar'
|
||||||
|
page.should have_content 'foobar2'
|
||||||
|
page.should_not have_content 'gitlab'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -14,6 +14,22 @@ describe "Profile" do
|
||||||
it { page.should have_content(@user.email) }
|
it { page.should have_content(@user.email) }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "Profile update" do
|
||||||
|
before do
|
||||||
|
visit profile_path
|
||||||
|
fill_in "user_skype", :with => "testskype"
|
||||||
|
fill_in "user_linkedin", :with => "testlinkedin"
|
||||||
|
fill_in "user_twitter", :with => "testtwitter"
|
||||||
|
click_button "Save"
|
||||||
|
@user.reload
|
||||||
|
end
|
||||||
|
|
||||||
|
it { @user.skype.should == 'testskype' }
|
||||||
|
it { @user.linkedin.should == 'testlinkedin' }
|
||||||
|
it { @user.twitter.should == 'testtwitter' }
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
describe "Password update" do
|
describe "Password update" do
|
||||||
before do
|
before do
|
||||||
visit profile_password_path
|
visit profile_password_path
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -7,6 +7,15 @@ describe "TeamMembers" do
|
||||||
@project.add_access(@user, :read, :admin)
|
@project.add_access(@user, :read, :admin)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "View profile" do
|
||||||
|
it "should be available" do
|
||||||
|
visit(team_project_path(@project))
|
||||||
|
find(:xpath, "//table[@id='team-table']//a[1]").click
|
||||||
|
page.should have_content @user.skype
|
||||||
|
page.should_not have_content 'Twitter'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe "New Team member", :js => true do
|
describe "New Team member", :js => true do
|
||||||
before do
|
before do
|
||||||
@user_1 = Factory :user
|
@user_1 = Factory :user
|
||||||
|
|
|
@ -3,7 +3,8 @@ module LoginMacros
|
||||||
@user = User.create(:email => "user#{User.count}@mail.com",
|
@user = User.create(:email => "user#{User.count}@mail.com",
|
||||||
:name => "John Smith",
|
:name => "John Smith",
|
||||||
:password => "123456",
|
:password => "123456",
|
||||||
:password_confirmation => "123456")
|
:password_confirmation => "123456",
|
||||||
|
:skype => 'user_skype')
|
||||||
|
|
||||||
if role == :admin
|
if role == :admin
|
||||||
@user.admin = true
|
@user.admin = true
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue