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

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

View file

@ -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

View file

@ -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

View file

@ -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',