def app_theme
Gitlab::Theme.css_class_by_id(current_user.try(:theme_id))
end
+
+ def show_last_push_widget?(event)
+ event && event.last_push_to_non_root? &&
+ event.project && event.project.merge_requests_enabled
+ end
end
end
def recent_push project_id = nil
- # Get push events not earlier than 6 hours ago
- events = recent_events.code_push.where("created_at > ?", Time.now - 6.hours)
+ # Get push events not earlier than 2 hours ago
+ events = recent_events.code_push.where("created_at > ?", Time.now - 2.hours)
events = events.where(:project_id => project_id) if project_id
# Take only latest one
data[:ref]["refs/tags"]
end
+ def branch?
+ data[:ref]["refs/heads"]
+ end
+
def new_branch?
commit_from =~ /^00000/
end
def push_with_commits?
md_ref? && commits.any? && parent_commit && last_commit
end
+
+ def last_push_to_non_root?
+ branch? && project.default_branch != branch_name
+ end
end
-- if event && event.branch_name
+- if show_last_push_widget?(event)
.event_lp
%div
= image_tag gravatar_icon(event.author_email), :class => "avatar"
- %span Your last push was to
+ %span Your pushed to
= event.ref_type
= link_to project_commits_path(event.project, :ref => event.ref_name) do
%strong= event.ref_name
= time_ago_in_words(event.created_at)
ago.
- - if event.project.merge_requests_enabled
- = link_to new_mr_path_from_push_event(event), :title => "New Merge Request", :class => "btn small padded primary" do
- Create Merge Request
+ = link_to new_mr_path_from_push_event(event), :title => "New Merge Request", :class => "btn small padded primary" do
+ Create Merge Request
Issue
= render "events/event_last_push", :event => @last_push
-- unless @events.blank?
- %br
- %h5.cgray
- %span.ico.activities
- Recent Activity
- %hr
- .content_list= render @events
+.content_list= render @events
end
Then /^I should see last push widget$/ do
- page.should have_content "Your last push was to branch new_design"
+ page.should have_content "Your pushed to branch new_design"
page.should have_link "Create Merge Request"
end
end
it "should display last push widget with link to merge request page" do
- page.should have_content "Your last push was to branch new_design"
+ page.should have_content "Your pushed to branch new_design"
page.should have_link "Create Merge Request"
end