diff options
41 files changed, 265 insertions, 66 deletions
diff --git a/CHANGELOG b/CHANGELOG index 588e70c4167..9676354fdc8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,15 @@ +v 2.6.0 + - UI polished + - Improved network graph + keyboard nav + - Handle huge commits + - Last Push widget + - Bugfix + - Better perfomance + - Email in resque + - Increased test coverage + - Ability to remove branch with MR accept + - a lot of code refactored + v 2.5.0 - UI polished - Git blame for file @@ -35,21 +35,21 @@ gem "httparty" gem "charlock_holmes" gem "foreman" gem "omniauth-ldap" -gem 'bootstrap-sass', "2.0.3.1" gem "colored" gem 'resque_mailer' -gem 'chosen-rails' - -gem "jquery-rails", "2.0.2" -gem "jquery-ui-rails", "0.5.0" -gem "modernizr", "2.5.3" -gem "graphael-rails", "0.1.4" group :assets do gem "sass-rails", "3.2.5" gem "coffee-rails", "3.2.2" gem "uglifier", "1.0.3" gem "therubyracer" + + gem 'chosen-rails' + gem "jquery-rails", "2.0.2" + gem "jquery-ui-rails", "0.5.0" + gem "modernizr", "2.5.3" + gem "raphael-rails", "1.5.2" + gem 'bootstrap-sass', "2.0.3.1" end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 41cb556babe..c454a41ca0d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -151,8 +151,6 @@ GEM gherkin (2.11.0) json (>= 1.4.6) git (1.2.5) - graphael-rails (0.1.4) - jeweler haml (3.1.6) haml-rails (0.3.4) actionpack (~> 3.0) @@ -166,11 +164,6 @@ GEM multi_json (~> 1.0) multi_xml i18n (0.6.0) - jeweler (1.8.3) - bundler (~> 1.0) - git (>= 1.2.5) - rake - rdoc journey (1.0.3) jquery-rails (2.0.2) railties (>= 3.2.0, < 5.0) @@ -249,6 +242,7 @@ GEM thor (>= 0.14.6, < 2.0) raindrops (0.9.0) rake (0.9.2.2) + raphael-rails (1.5.2) rdoc (3.12) json (~> 1.4) redcarpet (2.1.1) @@ -373,7 +367,6 @@ DEPENDENCIES foreman git gitolite! - graphael-rails (= 0.1.4) grit! haml-rails httparty @@ -391,6 +384,7 @@ DEPENDENCIES pygments.rb! rails (= 3.2.5) rails-footnotes + raphael-rails (= 1.5.2) redcarpet (~> 2.1.1) resque (~> 1.20.0) resque_mailer @@ -1 +1 @@ -2.5.0 +2.6.2 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 0af0b11a931..42290f8e154 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -15,7 +15,7 @@ //= require bootstrap-modal //= require modernizr //= require chosen-jquery -//= require raphael/raphael +//= require raphael //= require branch-graph //= require_tree . @@ -53,6 +53,14 @@ $(document).ready(function(){ e.preventDefault(); } }); + + /** + * Commit show suppressed diff + * + */ + $(".supp_diff_link").bind("click", function() { + showDiff(this); + }); }); function focusSearch() { diff --git a/app/assets/javascripts/graph.js b/app/assets/javascripts/graph.js index 163aa13e03b..434cf70ac65 100644 --- a/app/assets/javascripts/graph.js +++ b/app/assets/javascripts/graph.js @@ -1,5 +1,6 @@ function initGraphNav() { - $("body").keydown(function(e) { + $(".graph svg").css("position", "relative"); + $("body").bind("keyup", function(e) { if(e.keyCode == 37) { // left $(".graph svg").animate({ left: "+=400" }); } else if(e.keyCode == 39) { // right diff --git a/app/assets/javascripts/merge_requests.js b/app/assets/javascripts/merge_requests.js index c075cb4c0a3..8df090cfa37 100644 --- a/app/assets/javascripts/merge_requests.js +++ b/app/assets/javascripts/merge_requests.js @@ -34,6 +34,10 @@ var MergeRequest = { $(".merge-request-diffs").show(); e.preventDefault(); }); + + $(".mr_show_all_commits").bind("click", function() { + MergeRequest.showAllCommits(); + }) }, showState: diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 82d43d4c83e..ec5faff343c 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -602,3 +602,103 @@ li.note { min-height:42px; } +.supp_diff_link, +.mr_show_all_commits { + cursor:pointer; +} + +/** + * Issues, MRs legend + * + */ + +.list_legend { + float:left; + margin-right:20px; + .icon { + width:16px; + height:16px; + float:left; + margin-right:5px; + @include border-radius(4px); + &.critical { + background: #EAA; + border:1px solid #B88; + } + &.today{ + background: #ADA; + border:1px solid #8B8; + } + &.closed { + background: #DDD; + border:1px solid #BBB; + } + &.yours { + background: #AAD; + border:1px solid #88B; + } + &.merged { + background: #DAD; + border:1px solid #B8B; + } + } + .text { + padding-bottom: 10px; + float:left; + } +} + +.merge_request, +.issue { + .list_legend { + margin-right: 5px; + margin-top: 10px; + .icon { + width:16px; + height:16px; + float:left; + margin-right:5px; + @include border-radius(4px); + border:1px solid #ddd; + } + } + + &.critical { + background: #FEE; + border-color:#ECC; + .icon { + background: #EAA; + border:1px solid #B88; + } + } + &.today{ + background: #EFE; + border-color:#CEC; + .icon { + background: #ADA; + border:1px solid #8B8; + } + } + &.closed { + background: #F5f5f5; + border-color:#E5E5E5; + .icon { + background: #DDD; + border:1px solid #BBB; + } + } + &.yours { + .icon { + background: #AAD; + border:1px solid #88B; + } + } + &.merged { + background: #FEF; + border-color:#EDE; + .icon { + background: #DAD; + border:1px solid #B8B; + } + } +} diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss index 4df2b7e2684..091003e407e 100644 --- a/app/assets/stylesheets/gitlab_bootstrap.scss +++ b/app/assets/stylesheets/gitlab_bootstrap.scss @@ -579,4 +579,3 @@ ul.breadcrumb { border-top:1px solid #eee; } } - diff --git a/app/assets/stylesheets/sections/issues.scss b/app/assets/stylesheets/sections/issues.scss index cbaca760bd7..a3bd408bb7e 100644 --- a/app/assets/stylesheets/sections/issues.scss +++ b/app/assets/stylesheets/sections/issues.scss @@ -25,3 +25,5 @@ @extend .bottom_box_content; } } + + diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb index e4b97368fc5..5266b406504 100644 --- a/app/controllers/admin/projects_controller.rb +++ b/app/controllers/admin/projects_controller.rb @@ -4,7 +4,9 @@ class Admin::ProjectsController < ApplicationController before_filter :authenticate_admin! def index - @admin_projects = Project.page(params[:page]) + @admin_projects = Project.scoped + @admin_projects = @admin_projects.search(params[:name]) if params[:name].present? + @admin_projects = @admin_projects.page(params[:page]) end def show diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index bbb1990c8a7..79838665336 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -6,6 +6,7 @@ class Admin::UsersController < ApplicationController def index @admin_users = User.scoped @admin_users = @admin_users.filter(params[:filter]) + @admin_users = @admin_users.search(params[:name]) if params[:name].present? @admin_users = @admin_users.order("updated_at DESC").page(params[:page]) end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 609445e6c7e..ac70f651358 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -96,7 +96,7 @@ class ProjectsController < ApplicationController UsersProject.set_callback(:destroy, :after, :update_repository) respond_to do |format| - format.html { redirect_to projects_url } + format.html { redirect_to root_path } end end diff --git a/app/decorators/commit_decorator.rb b/app/decorators/commit_decorator.rb index 348d1e93bfc..cc8fa97587b 100644 --- a/app/decorators/commit_decorator.rb +++ b/app/decorators/commit_decorator.rb @@ -26,8 +26,4 @@ class CommitDecorator < ApplicationDecorator safe_message.split(/\n/, 2)[1].try(:chomp) end end - - def breadcrumbs - - end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index be0e0c9eedf..8e151ef75df 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -88,4 +88,9 @@ module ApplicationHelper 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 diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index a314f3876bd..7ee85a5b487 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -17,7 +17,7 @@ module CommitsHelper preserve out end - def diff_line_class(line) + def identification_type(line) if line[0] == "+" "new" elsif line[0] == "-" @@ -27,7 +27,7 @@ module CommitsHelper end end - def build_line_code(line, index, line_new, line_old) + def build_line_anchor(index, line_new, line_old) "#{index}_#{line_old}_#{line_new}" end @@ -51,12 +51,12 @@ module CommitsHelper line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0 line_new = line.match(/\+[0-9]*/)[0].to_i.abs rescue 0 - next if line_old == 1 && line_new == 1 + next if line_old == 1 && line_new == 1 #top of file yield(full_line, type, nil, nil, nil) next else - type = diff_line_class(line) - line_code = build_line_code(line, index, line_new, line_old) + type = identification_type(line) + line_code = build_line_anchor(index, line_new, line_old) yield(full_line, type, line_code, line_new, line_old) end diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index ba953ed3c64..31d862ef725 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -25,4 +25,12 @@ module IssuesHelper issue.author_name end end + + def issue_css_classes issue + classes = "issue" + classes << " critical" if issue.critical + classes << " closed" if issue.closed + classes << " today" if issue.today? + classes + end end diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 96e0ab4dd5a..29e7c6f745f 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -31,4 +31,12 @@ module MergeRequestsHelper } ) end + + def mr_css_classes mr + classes = "merge_request" + classes << " closed" if mr.closed + classes << " merged" if mr.merged? + classes << " today" if mr.today? + classes + end end diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index d532373f1b2..12365b03059 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -93,6 +93,10 @@ class MergeRequest < ActiveRecord::Base self.save end + def today? + Date.today == created_at.to_date + end + def new? today? && created_at == updated_at end diff --git a/app/models/user.rb b/app/models/user.rb index 50854bf9e50..69d5ec71e68 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -83,6 +83,10 @@ class User < ActiveRecord::Base ) end end + + def self.search query + where("name like :query or email like :query", :query => "%#{query}%") + end end # == Schema Information # diff --git a/app/roles/account.rb b/app/roles/account.rb index 8ff5c613e51..afa1f8a347d 100644 --- a/app/roles/account.rb +++ b/app/roles/account.rb @@ -48,8 +48,8 @@ module Account 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 diff --git a/app/roles/push_event.rb b/app/roles/push_event.rb index acec916f893..ff8e28a2db2 100644 --- a/app/roles/push_event.rb +++ b/app/roles/push_event.rb @@ -9,6 +9,10 @@ module PushEvent data[:ref]["refs/tags"] end + def branch? + data[:ref]["refs/heads"] + end + def new_branch? commit_from =~ /^00000/ end @@ -87,4 +91,8 @@ module PushEvent 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 diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml index e4f19e1ccc0..932fb37ddf6 100644 --- a/app/views/admin/projects/index.html.haml +++ b/app/views/admin/projects/index.html.haml @@ -2,6 +2,10 @@ Projects = link_to 'New Project', new_admin_project_path, :class => "btn small right" %br += form_tag admin_projects_path, :method => :get do + = text_field_tag :name, params[:name], :class => "xlarge" + = submit_tag "Search", :class => "btn submit primary" + %table.admin-table %thead %th Name diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index ea7b3130917..481bf37bb0b 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -3,6 +3,9 @@ = link_to 'New User', new_admin_user_path, :class => "btn small right" %br += form_tag admin_users_path, :method => :get do + = text_field_tag :name, params[:name], :class => "xlarge" + = submit_tag "Search", :class => "btn submit primary" %ul.nav.nav-pills %li{:class => "#{'active' unless params[:filter]}"} = link_to "Active", admin_users_path diff --git a/app/views/commits/_text_file.html.haml b/app/views/commits/_text_file.html.haml index e5173b00ed7..cab066410b4 100644 --- a/app/views/commits/_text_file.html.haml +++ b/app/views/commits/_text_file.html.haml @@ -1,6 +1,6 @@ -- too_big = max_lines = diff.diff.lines.count > 1000 +- too_big = diff.diff.lines.count > 1000 - if too_big - = link_to_function "Diff suppressed. Click to show", "showDiff(this)", :class => "supp_diff_link" + %a.supp_diff_link Diff suppressed. Click to show %table{:class => "#{'hide' if too_big}"} - each_diff_line(diff.diff.lines.to_a, index) do |line, type, line_code, line_new, line_old| diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index b794e634bf8..b6bcdf8d8fb 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -4,6 +4,15 @@ %small.right #{@issues.total_count} issues %br +.issues_legend + .list_legend + .icon.critical + .text Critical + + .list_legend + .icon.today + .text Today +.clearfix - if @issues.any? - @issues.group_by(&:project).each do |group| %div.ui-box diff --git a/app/views/events/_event_last_push.html.haml b/app/views/events/_event_last_push.html.haml index 8c6918d2548..eb507b55c9b 100644 --- a/app/views/events/_event_last_push.html.haml +++ b/app/views/events/_event_last_push.html.haml @@ -1,8 +1,8 @@ -- 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 @@ -12,6 +12,5 @@ = 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 diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index d12b192bff2..649811ea073 100644 --- a/app/views/help/index.html.haml +++ b/app/views/help/index.html.haml @@ -1,6 +1,6 @@ %h3.cgray GITLAB - %span.right v2.5 + %span.right v2.6 %hr %h4 Self Hosted Git Management %h4 Fast, secure and stable solution based on Ruby on Rails & Gitolite. diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml index bb7c81f9a8e..e7dc3f835b2 100644 --- a/app/views/issues/_show.html.haml +++ b/app/views/issues/_show.html.haml @@ -1,4 +1,6 @@ -%li.wll{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(issue.project, issue) } +%li.wll{ :id => dom_id(issue), :class => issue_css_classes(issue), :url => project_issue_path(issue.project, issue) } + .list_legend + .icon .right - if issue.notes.any? %span.btn.small.disabled.padded= pluralize issue.notes.count, 'note' @@ -15,12 +17,8 @@ %span.update-author assigned to %strong= issue.assignee_name - - if issue.critical - %span.label.important critical - - if issue.today? - %span.label.success today - if issue.upvotes > 0 - %span.label.success= "+#{issue.upvotes}" + %span.badge.badge-success= "+#{issue.upvotes}" = link_to project_issue_path(issue.project, issue) do %p.row_title= truncate(issue.title, :length => 100) diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index 1a321e6f8e0..ade80dade8f 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -14,6 +14,21 @@ = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search span3 right neib' } %br + + .issues_legend + .list_legend + .icon.critical + .text Critical + + .list_legend + .icon.closed + .text Closed + + .list_legend + .icon.today + .text Today + .clearfix + %div#issues-table-holder.ui-box .title .row diff --git a/app/views/merge_requests/_commits.html.haml b/app/views/merge_requests/_commits.html.haml index 441a7f32ef4..78fe1a062d3 100644 --- a/app/views/merge_requests/_commits.html.haml +++ b/app/views/merge_requests/_commits.html.haml @@ -1,4 +1,4 @@ -- unless @commits.empty? +- if @commits.present? .ui-box %h5 Commits (#{@commits.count}) .merge-request-commits @@ -9,7 +9,7 @@ %li.bottom 8 of #{@commits.count} commits displayed. %strong - = link_to_function "Click here to show all", "MergeRequest.showAllCommits()" + %a.mr_show_all_commits Click here to show all %ul.all_mr_commits.hide.unstyled - @commits.each do |commit| = render "commits/commit", :commit => commit diff --git a/app/views/merge_requests/_merge_request.html.haml b/app/views/merge_requests/_merge_request.html.haml index 54300fae0d5..e744a9617c8 100644 --- a/app/views/merge_requests/_merge_request.html.haml +++ b/app/views/merge_requests/_merge_request.html.haml @@ -1,4 +1,6 @@ -%li.wll +%li.wll{ :class => mr_css_classes(merge_request) } + .list_legend + .icon .right .left - if merge_request.notes.any? @@ -14,6 +16,6 @@ = time_ago_in_words(merge_request.created_at) ago - if merge_request.upvotes > 0 - %span.label.success= "+#{merge_request.upvotes}" + %span.badge.badge-success= "+#{merge_request.upvotes}" = link_to project_merge_request_path(merge_request.project, merge_request) do %p.row_title= truncate(merge_request.title, :length => 80) diff --git a/app/views/merge_requests/index.html.haml b/app/views/merge_requests/index.html.haml index 3ec2b10bf7b..d98e52b9346 100644 --- a/app/views/merge_requests/index.html.haml +++ b/app/views/merge_requests/index.html.haml @@ -6,6 +6,20 @@ %br +.mrs_legend + .list_legend + .icon.today + .text Today + + .list_legend + .icon.merged + .text Merged + + .list_legend + .icon.closed + .text Closed +.clearfix + .ui-box .title %ul.nav.nav-pills @@ -26,7 +40,7 @@ = render @merge_requests - if @merge_requests.blank? %li - %p.padded Nothing to show here + %h4.nothing_here_message Nothing to show here - if @merge_requests.present? %li.bottom .row diff --git a/app/views/milestones/index.html.haml b/app/views/milestones/index.html.haml index 58d25874bd5..89d3b616374 100644 --- a/app/views/milestones/index.html.haml +++ b/app/views/milestones/index.html.haml @@ -22,4 +22,4 @@ %li.bottom= paginate @milestones, :remote => true, :theme => "gitlab" - else %li - %p.padded Nothing to show here + %h3.nothing_here_message Nothing to show here diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 48b541544ff..44f9053d3f6 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -21,12 +21,6 @@ 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 diff --git a/config/application.rb b/config/application.rb index 6242b655e49..3585c4b0a87 100644 --- a/config/application.rb +++ b/config/application.rb @@ -4,9 +4,9 @@ require 'rails/all' if defined?(Bundler) # If you precompile assets before deploying to production, use this line - Bundler.require *Rails.groups(:assets => %w(development test)) + # Bundler.require *Rails.groups(:assets => %w(development test)) # If you want your assets lazily compiled in production, use this line - # Bundler.require(:default, :assets, Rails.env) + Bundler.require(:default, :assets, Rails.env) end module Gitlab diff --git a/config/initializers/protect_resque.rb b/config/initializers/protect_resque.rb new file mode 100644 index 00000000000..d52815ffa9c --- /dev/null +++ b/config/initializers/protect_resque.rb @@ -0,0 +1,5 @@ +require 'resque/server' +Resque::Server.use(Rack::Auth::Basic) do |user, password| + user == "gitlab" + password == "5iveL!fe" +end diff --git a/doc/installation.md b/doc/installation.md index 344597dba68..bf579b174c3 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -216,7 +216,7 @@ Application can be started with next command: sudo -u gitlab cp config/unicorn.rb.orig config/unicorn.rb sudo -u gitlab bundle exec unicorn_rails -c config/unicorn.rb -E production -D -Edit /etc/nginx/nginx.conf. Add next code to **http** section: +Edit /etc/nginx/nginx.conf. Add in **http** section: upstream gitlab { server unix:/home/gitlab/gitlab/tmp/sockets/gitlab.socket; @@ -320,9 +320,9 @@ Adding permission: sudo chmod +x /etc/init.d/gitlab -When server is rebooted then gitlab must starting: +Gitlab autostart: - sudo insserv gitlab + sudo update-rc.d gitlab defaults Now you can start/restart/stop gitlab like: diff --git a/features/projects/source/browse_files.feature b/features/projects/source/browse_files.feature.commented index 04aebc19732..04aebc19732 100644 --- a/features/projects/source/browse_files.feature +++ b/features/projects/source/browse_files.feature.commented diff --git a/features/step_definitions/dashboard_steps.rb b/features/step_definitions/dashboard_steps.rb index ef48a850324..7133d799995 100644 --- a/features/step_definitions/dashboard_steps.rb +++ b/features/step_definitions/dashboard_steps.rb @@ -42,7 +42,7 @@ Given /^project "(.*?)" has push event$/ do |arg1| 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 diff --git a/spec/requests/last_push_widget_spec.rb b/spec/requests/last_push_widget_spec.rb index 55ef3f0ac5e..0baa20c6e94 100644 --- a/spec/requests/last_push_widget_spec.rb +++ b/spec/requests/last_push_widget_spec.rb @@ -11,7 +11,7 @@ describe "Last Push widget" do 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 |