Commit 76aca721 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

parents 8b362fbf 654f9498
...@@ -143,7 +143,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -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
......
...@@ -17,7 +17,7 @@ ...@@ -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
......
...@@ -21,7 +21,7 @@ Gitlab::Seeder.quiet do ...@@ -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',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment