diff --git a/app/models/event.rb b/app/models/event.rb
index 6b1180d7c8ccd0dbeed514ea22bb31602123a8e4..c5c08df600bc3ae99f7a13b4e8dbe624997cecbf 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -33,6 +33,10 @@ class Event < ActiveRecord::Base
action == self.class::Pushed
end
+ def new_tag?
+ data[:ref]["refs/tags"]
+ end
+
def new_branch?
data[:before] =~ /^00000/
end
@@ -49,6 +53,10 @@ class Event < ActiveRecord::Base
@branch_name ||= data[:ref].gsub("refs/heads/", "")
end
+ def tag_name
+ @tag_name ||= data[:ref].gsub("refs/tags/", "")
+ end
+
def pusher
User.find_by_id(data[:user_id])
end
diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml
index 72fb42ab4e6e593a95ed64f58ec75f70ce1b78b3..c7fbc8fd748fe7222b78064ede01cd657d3c422d 100644
--- a/app/views/dashboard/index.html.haml
+++ b/app/views/dashboard/index.html.haml
@@ -1,5 +1,5 @@
- if current_user.require_ssh_key?
- .alert-message.warning
+ .alert-message.block-message.error
%p
You wont be able to pull/push project code unless you
= link_to new_key_path, :class => "vlink" do
@@ -32,7 +32,7 @@
New Project »
-- unless @merge_requests.blank?
+- if @merge_requests.any?
%div.dashboard_category
%h3
= link_to "Merge Requests" , "#merge_requests", :id => "merge_requests"
@@ -45,7 +45,7 @@
.row
.dashboard_block= render "dashboard/merge_requests_feed"
-- unless @issues.blank?
+- if @issues.any?
%div.dashboard_category
%h3
= link_to "Issues" , "#issues", :id => "issues"
@@ -57,7 +57,7 @@
.row
.dashboard_block= render "dashboard/issues_feed"
-- unless @events.blank?
+- if @events.any?
%div.dashboard_category
%h3
%span.ico.activities
diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml
index b9c467a5235de00953cefebb96ef848b6f9438ed..c543dbe920a0ef56b23ba4cb3733d55106a378f1 100644
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
@@ -3,4 +3,5 @@
%small ( assigned to you )
%br
-.ui-box= render "dashboard/issues_feed"
+- if @issues.any?
+ .ui-box= render "dashboard/issues_feed"
diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml
index ec1c233c33c2f33dd80218ca5b6d3eb8dc207b55..4acdb4dae28da22f37d4a525d2df206dbde9cc85 100644
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
@@ -3,4 +3,5 @@
%small ( authored or assigned to you )
%br
-.ui-box= render "dashboard/merge_requests_feed"
+- if @merge_requests.any?
+ .ui-box= render "dashboard/merge_requests_feed"
diff --git a/app/views/deploy_keys/index.html.haml b/app/views/deploy_keys/index.html.haml
index b03e75398064e90d3bed17cbc42dc98afeb76dd2..09db49fed4a28d3bdbf0af6c4553510db15298f2 100644
--- a/app/views/deploy_keys/index.html.haml
+++ b/app/views/deploy_keys/index.html.haml
@@ -5,6 +5,7 @@
= link_to new_project_deploy_key_path(@project), :class => "btn small", :title => "New Deploy Key" do
Add Deploy Key
-%table.zebra-striped.borders
- - @keys.each do |key|
- = render(:partial => 'show', :locals => {:key => key})
+- if @keys.any?
+ %table.zebra-striped.borders
+ - @keys.each do |key|
+ = render(:partial => 'show', :locals => {:key => key})
diff --git a/app/views/events/_event_push.html.haml b/app/views/events/_event_push.html.haml
index 705e8a0702bb7719d416dbeb68780b1fc1b4f93c..b48429f425b16a435f6802bd20846392a07ba20d 100644
--- a/app/views/events/_event_push.html.haml
+++ b/app/views/events/_event_push.html.haml
@@ -1,9 +1,15 @@
-- if event.new_branch?
+- if event.new_branch? || event.new_tag?
= image_tag gravatar_icon(event.pusher_email), :class => "avatar"
%strong #{event.pusher_name}
- pushed new branch
- = link_to project_commits_path(event.project, :ref => event.branch_name) do
- %strong= event.branch_name
+ pushed new
+ - if event.new_tag?
+ 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
%strong= link_to event.project.name, event.project
%span.cgray
diff --git a/app/views/hooks/_data_ex.html.erb b/app/views/hooks/_data_ex.html.erb
index f212bb2dc0b7666cfb9c448ac63c883b0574d469..838b7da114a5ea8aa033b221e19b8e3c0aaee37c 100644
--- a/app/views/hooks/_data_ex.html.erb
+++ b/app/views/hooks/_data_ex.html.erb
@@ -3,6 +3,8 @@
:before => "95790bf891e76fee5e1747ab589903a6a1f80f22",
:after => "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
:ref => "refs/heads/master",
+ :user_id => 4,
+ :user_name => "John Smith",
:repository => {
:name => "Diaspora",
:url => "localhost/diaspora",
diff --git a/app/views/hooks/index.html.haml b/app/views/hooks/index.html.haml
index 69881752e4b3a725f40275909c43b441038146a2..64497a1c5e3bee05740ae197268736e106768413 100644
--- a/app/views/hooks/index.html.haml
+++ b/app/views/hooks/index.html.haml
@@ -6,17 +6,16 @@
= link_to new_project_hook_path(@project), :class => "btn small", :title => "New Web Hook" do
Add Post Receive Hook
-%table.zebra-striped.borders
- - @hooks.each do |hook|
- %tr
- %td
- = link_to project_hook_path(@project, hook) do
- = hook.url
- %td
- = link_to 'Remove', project_hook_path(@project, hook), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small"
+-if @hooks.any?
+ %table.zebra-striped.borders
+ - @hooks.each do |hook|
+ %tr
+ %td
+ = link_to project_hook_path(@project, hook) do
+ = hook.url
+ %td
+ = link_to 'Remove', project_hook_path(@project, hook), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small"
-
-.alert-message.block-message
- We send some data with POST request when someone makes git push
-
-.well= render "data_ex"
+.ui-box
+ %h5 Hooks request example
+ .data= render "data_ex"
diff --git a/app/views/projects/files.html.haml b/app/views/projects/files.html.haml
index 48ceece772c2357557a691111cffcdff92d3db21..19252d423ee645247c79a8f8459c4613b9e16bb5 100644
--- a/app/views/projects/files.html.haml
+++ b/app/views/projects/files.html.haml
@@ -13,7 +13,7 @@
= time_ago_in_words(note.created_at)
ago
- else
- .notice_holder
- %li All files attached to project wall, issues etc will be displayed here
+ .alert-message.block-message
+ %p All files attached to project wall, issues etc will be displayed here
diff --git a/app/views/projects/index.html.haml b/app/views/projects/index.html.haml
index 20f4f510cddf7e5f0a3756ad63f855979f51275b..e163851fd4677c14d23824050c540e4a087e61af 100644
--- a/app/views/projects/index.html.haml
+++ b/app/views/projects/index.html.haml
@@ -1,21 +1,36 @@
-.row
- .span4
- %div.leftbar.ui-box
- %h5
- Projects
- - if current_user.can_create_project?
- %span.right
- = link_to new_project_path, :class => "btn very_small info" do
- New Project
- .content_list
- - @projects.each do |project|
- = link_to project_path(project), :remote => true, :class => dom_class(project) do
- %h4
- %span.ico.project
- = truncate(project.name, :length => 22)
- .span12.right
- .show_holder.ui-box.padded
- .loading
+- if @projects.any?
+ .row
+ .span4
+ %div.leftbar.ui-box
+ %h5
+ Projects
+ - if current_user.can_create_project?
+ %span.right
+ = link_to new_project_path, :class => "btn very_small info" do
+ New Project
+ .content_list
+ - @projects.each do |project|
+ = link_to project_path(project), :remote => true, :class => dom_class(project) do
+ %h4
+ %span.ico.project
+ = truncate(project.name, :length => 22)
+ .span12.right
+ .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
diff --git a/app/views/refs/tree.js.haml b/app/views/refs/tree.js.haml
index 97bc0b813503e4c61c175fa9689f95d43591447f..f4f28adc3697ed828aac28bd22f7eb948033c3ca 100644
--- a/app/views/refs/tree.js.haml
+++ b/app/views/refs/tree.js.haml
@@ -1,5 +1,4 @@
: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-content-holder").show("slide", { direction: "right" }, 150);
- //});
+ $("#tree-holder").html("#{escape_javascript(render(:partial => "tree", :locals => {:repo => @repo, :commit => @commit, :tree => @tree}))}");
+ $("#tree-content-holder").show("slide", { direction: "right" }, 150);
+ $('.project-refs-form #path').val("#{params[:path]}");