kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2014-09-30 22:48:00 +03:00
commit 76aca721b7
6 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/projects/merge_requests_controller.rb
View file

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

40
app/views/help/_shortcuts.html.haml
View file

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

2
app/views/profiles/keys/new.html.haml
View file

@ -13,4 +13,4 @@
if( key_mail && key_mail.length > 0 && title.val() == '' ){ if( key_mail && key_mail.length > 0 && title.val() == '' ){
$('#key_title').val( key_mail ); $('#key_title').val( key_mail );
} }
}); });

2
app/views/projects/_home_panel.html.haml
View file

@ -17,7 +17,7 @@
.fork-buttons .fork-buttons
- if current_user && can?(current_user, :fork_project, @project) && @project.namespace != current_user.namespace - if current_user && can?(current_user, :fork_project, @project) && @project.namespace != current_user.namespace
- if current_user.already_forked?(@project) - 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 = link_to_toggle_fork
- else - else
= link_to fork_project_path(@project), title: "Fork project", method: "POST" do = link_to fork_project_path(@project), title: "Fork project", method: "POST" do

2
app/views/projects/repositories/_download_archive.html.haml
View file

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

2
db/fixtures/development/10_merge_requests.rb
View file

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