Merge branch 'master' of github.com:gitlabhq/gitlabhq

app/controllers/projects/merge_requests_controller.rb

@@ -143,7 +143,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   def update_branches
     @target_project = selected_target_project
     @target_branches = @target_project.repository.branch_names
-    @target_branches
 
     respond_to do |format|
       format.js

app/views/help/_shortcuts.html.haml

@@ -3,9 +3,9 @@
     .modal-content
       .modal-header
         %a.close{href: "#", "data-dismiss" => "modal"} ×
-        %h4 
+        %h4
           Keyboard Shortcuts
-          %small 
+          %small
             = link_to '(Show all)', '#', class: 'js-more-help-button'
       .modal-body.shortcuts-cheatsheet
         .col-lg-4
@@ -15,11 +15,11 @@
                 %th
                 %th Global Shortcuts
               %tr
-                %td.shortcut 
+                %td.shortcut
                   .key s
                 %td Focus Search
               %tr
-                %td.shortcut 
+                %td.shortcut
                   .key ?
                 %td Show this dialog
             %tbody
@@ -37,7 +37,7 @@
                     %i.icon-arrow-down
                 %td Move selection down
               %tr
-                %td.shortcut 
+                %td.shortcut
                   .key enter
                 %td Open Selection
 
@@ -48,25 +48,25 @@
                 %th
                 %th Global Dashboard
               %tr
-                %td.shortcut 
+                %td.shortcut
                   .key g
                   .key a
                 %td
                   Go to the activity feed
               %tr
-                %td.shortcut 
+                %td.shortcut
                   .key g
                   .key p
                 %td
                   Go to projects
               %tr
-                %td.shortcut 
+                %td.shortcut
                   .key g
                   .key i
                 %td
                   Go to issues
               %tr
-                %td.shortcut 
+                %td.shortcut
                   .key g
                   .key m
                 %td
@@ -76,43 +76,43 @@
                 %th
                 %th Project
               %tr
-                %td.shortcut 
+                %td.shortcut
                   .key g
                   .key p
                 %td
                   Go to the project's activity feed
               %tr
-                %td.shortcut 
+                %td.shortcut
                   .key g
                   .key f
                 %td
                   Go to files
               %tr
-                %td.shortcut 
+                %td.shortcut
                   .key g
                   .key c
                 %td
                   Go to commits
               %tr
-                %td.shortcut 
+                %td.shortcut
                   .key g
                   .key n
                 %td
                   Go to network graph
               %tr
-                %td.shortcut 
+                %td.shortcut
                   .key g
                   .key g
                 %td
                   Go to graphs
               %tr
-                %td.shortcut 
+                %td.shortcut
                   .key g
                   .key i
                 %td
                   Go to issues
               %tr
-                %td.shortcut 
+                %td.shortcut
                   .key g
                   .key m
                 %td
@@ -180,11 +180,11 @@
                 %th
                 %th Issues
               %tr
-                %td.shortcut 
+                %td.shortcut
                   .key a
                 %td Change assignee
               %tr
-                %td.shortcut 
+                %td.shortcut
                   .key m
                 %td Change milestone
             %tbody{ class: 'hidden-shortcut merge_reuests', style: 'display:none' }
@@ -192,11 +192,11 @@
                 %th
                 %th Merge Requests
               %tr
-                %td.shortcut 
+                %td.shortcut
                   .key a
                 %td Change assignee
               %tr
-                %td.shortcut 
+                %td.shortcut
                   .key m
                 %td Change milestone
 

app/views/profiles/keys/new.html.haml

@@ -13,4 +13,4 @@
     if( key_mail && key_mail.length > 0 && title.val() == '' ){
       $('#key_title').val( key_mail );
     }
-  });
+  });
\ No newline at end of file

app/views/projects/_home_panel.html.haml

@@ -17,7 +17,7 @@
         .fork-buttons
           - if current_user && can?(current_user, :fork_project, @project) && @project.namespace != current_user.namespace
             - if current_user.already_forked?(@project)
-              = link_to project_path(current_user.fork_of(@project)), title: 'Got to my fork' do
+              = link_to project_path(current_user.fork_of(@project)), title: 'Go to my fork' do
                 = link_to_toggle_fork
             - else
               = link_to fork_project_path(@project), title: "Fork project", method: "POST" do

app/views/projects/repositories/_download_archive.html.haml

 - ref = ref || nil
 - btn_class = btn_class || ''
-- split_button = split_button || false 
+- split_button = split_button || false
 - if split_button == true
   %span.btn-group{class: btn_class}
     = link_to archive_project_repository_path(@project, ref: ref, format: 'zip'), class: 'btn', rel: 'nofollow' do

db/fixtures/development/10_merge_requests.rb

@@ -21,7 +21,7 @@ Gitlab::Seeder.quiet do
     end
   end
 
-  project = Project.find_with_namespace('gitlab-org/testme')
+  project = Project.find_with_namespace('gitlab-org/gitlab-test')
 
   params = {
     source_branch: 'feature',