Commit eb7bbedb authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Polishin & fixed tree switch

parent cb59aade
...@@ -33,6 +33,10 @@ class Event < ActiveRecord::Base ...@@ -33,6 +33,10 @@ class Event < ActiveRecord::Base
action == self.class::Pushed action == self.class::Pushed
end end
def new_tag?
data[:ref]["refs/tags"]
end
def new_branch? def new_branch?
data[:before] =~ /^00000/ data[:before] =~ /^00000/
end end
...@@ -49,6 +53,10 @@ class Event < ActiveRecord::Base ...@@ -49,6 +53,10 @@ class Event < ActiveRecord::Base
@branch_name ||= data[:ref].gsub("refs/heads/", "") @branch_name ||= data[:ref].gsub("refs/heads/", "")
end end
def tag_name
@tag_name ||= data[:ref].gsub("refs/tags/", "")
end
def pusher def pusher
User.find_by_id(data[:user_id]) User.find_by_id(data[:user_id])
end end
......
- if current_user.require_ssh_key? - if current_user.require_ssh_key?
.alert-message.warning .alert-message.block-message.error
%p %p
You wont be able to pull/push project code unless you You wont be able to pull/push project code unless you
= link_to new_key_path, :class => "vlink" do = link_to new_key_path, :class => "vlink" do
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
New Project » New Project »
- unless @merge_requests.blank? - if @merge_requests.any?
%div.dashboard_category %div.dashboard_category
%h3 %h3
= link_to "Merge Requests" , "#merge_requests", :id => "merge_requests" = link_to "Merge Requests" , "#merge_requests", :id => "merge_requests"
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
.row .row
.dashboard_block= render "dashboard/merge_requests_feed" .dashboard_block= render "dashboard/merge_requests_feed"
- unless @issues.blank? - if @issues.any?
%div.dashboard_category %div.dashboard_category
%h3 %h3
= link_to "Issues" , "#issues", :id => "issues" = link_to "Issues" , "#issues", :id => "issues"
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
.row .row
.dashboard_block= render "dashboard/issues_feed" .dashboard_block= render "dashboard/issues_feed"
- unless @events.blank? - if @events.any?
%div.dashboard_category %div.dashboard_category
%h3 %h3
%span.ico.activities %span.ico.activities
......
...@@ -3,4 +3,5 @@ ...@@ -3,4 +3,5 @@
%small ( assigned to you ) %small ( assigned to you )
%br %br
.ui-box= render "dashboard/issues_feed" - if @issues.any?
.ui-box= render "dashboard/issues_feed"
...@@ -3,4 +3,5 @@ ...@@ -3,4 +3,5 @@
%small ( authored or assigned to you ) %small ( authored or assigned to you )
%br %br
.ui-box= render "dashboard/merge_requests_feed" - if @merge_requests.any?
.ui-box= render "dashboard/merge_requests_feed"
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
= link_to new_project_deploy_key_path(@project), :class => "btn small", :title => "New Deploy Key" do = link_to new_project_deploy_key_path(@project), :class => "btn small", :title => "New Deploy Key" do
Add Deploy Key Add Deploy Key
%table.zebra-striped.borders - if @keys.any?
- @keys.each do |key| %table.zebra-striped.borders
= render(:partial => 'show', :locals => {:key => key}) - @keys.each do |key|
= render(:partial => 'show', :locals => {:key => key})
- if event.new_branch? - if event.new_branch? || event.new_tag?
= image_tag gravatar_icon(event.pusher_email), :class => "avatar" = image_tag gravatar_icon(event.pusher_email), :class => "avatar"
%strong #{event.pusher_name} %strong #{event.pusher_name}
pushed new branch pushed new
= link_to project_commits_path(event.project, :ref => event.branch_name) do - if event.new_tag?
%strong= event.branch_name tag
= link_to project_commits_path(event.project, :ref => event.tag_name) do
%strong= event.tag_name
- else
branch
= link_to project_commits_path(event.project, :ref => event.branch_name) do
%strong= event.branch_name
at at
%strong= link_to event.project.name, event.project %strong= link_to event.project.name, event.project
%span.cgray %span.cgray
......
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
:before => "95790bf891e76fee5e1747ab589903a6a1f80f22", :before => "95790bf891e76fee5e1747ab589903a6a1f80f22",
:after => "da1560886d4f094c3e6c9ef40349f7d38b5d27d7", :after => "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
:ref => "refs/heads/master", :ref => "refs/heads/master",
:user_id => 4,
:user_name => "John Smith",
:repository => { :repository => {
:name => "Diaspora", :name => "Diaspora",
:url => "localhost/diaspora", :url => "localhost/diaspora",
......
...@@ -6,17 +6,16 @@ ...@@ -6,17 +6,16 @@
= link_to new_project_hook_path(@project), :class => "btn small", :title => "New Web Hook" do = link_to new_project_hook_path(@project), :class => "btn small", :title => "New Web Hook" do
Add Post Receive Hook Add Post Receive Hook
%table.zebra-striped.borders -if @hooks.any?
- @hooks.each do |hook| %table.zebra-striped.borders
%tr - @hooks.each do |hook|
%td %tr
= link_to project_hook_path(@project, hook) do %td
= hook.url = link_to project_hook_path(@project, hook) do
%td = hook.url
= link_to 'Remove', project_hook_path(@project, hook), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small" %td
= link_to 'Remove', project_hook_path(@project, hook), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small"
.ui-box
.alert-message.block-message %h5 Hooks request example
We send some data with POST request when someone makes git push .data= render "data_ex"
.well= render "data_ex"
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
= time_ago_in_words(note.created_at) = time_ago_in_words(note.created_at)
ago ago
- else - else
.notice_holder .alert-message.block-message
%li All files attached to project wall, issues etc will be displayed here %p All files attached to project wall, issues etc will be displayed here
.row - if @projects.any?
.span4 .row
%div.leftbar.ui-box .span4
%h5 %div.leftbar.ui-box
Projects %h5
- if current_user.can_create_project? Projects
%span.right - if current_user.can_create_project?
= link_to new_project_path, :class => "btn very_small info" do %span.right
New Project = link_to new_project_path, :class => "btn very_small info" do
.content_list New Project
- @projects.each do |project| .content_list
= link_to project_path(project), :remote => true, :class => dom_class(project) do - @projects.each do |project|
%h4 = link_to project_path(project), :remote => true, :class => dom_class(project) do
%span.ico.project %h4
= truncate(project.name, :length => 22) %span.ico.project
.span12.right = truncate(project.name, :length => 22)
.show_holder.ui-box.padded .span12.right
.loading .show_holder.ui-box.padded
.loading
- else
%h3 Nothing here
%br
- if current_user.can_create_project?
.alert-message.block-message.warning
You can create up to
= current_user.projects_limit
projects. Click on link below to add a new one
.link_holder
= link_to new_project_path, :class => "" do
New Project »
- else
If you will be added to project - it will be displayed here
:javascript :javascript
......
:plain :plain
//$("#tree-content-holder").hide("slide", { direction: "left" }, 150, function(){ $("#tree-holder").html("#{escape_javascript(render(:partial => "tree", :locals => {:repo => @repo, :commit => @commit, :tree => @tree}))}");
$("#tree-holder").html("#{escape_javascript(render(:partial => "tree", :locals => {:repo => @repo, :commit => @commit, :tree => @tree}))}"); $("#tree-content-holder").show("slide", { direction: "right" }, 150);
$("#tree-content-holder").show("slide", { direction: "right" }, 150); $('.project-refs-form #path').val("#{params[:path]}");
//});
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