Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
76aca721
Commit
76aca721
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:gitlabhq/gitlabhq
parents
8b362fbf
654f9498
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
25 deletions
+24
-25
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+0
-1
app/views/help/_shortcuts.html.haml
app/views/help/_shortcuts.html.haml
+20
-20
app/views/profiles/keys/new.html.haml
app/views/profiles/keys/new.html.haml
+1
-1
app/views/projects/_home_panel.html.haml
app/views/projects/_home_panel.html.haml
+1
-1
app/views/projects/repositories/_download_archive.html.haml
app/views/projects/repositories/_download_archive.html.haml
+1
-1
db/fixtures/development/10_merge_requests.rb
db/fixtures/development/10_merge_requests.rb
+1
-1
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
76aca721
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
app/views/help/_shortcuts.html.haml
View file @
76aca721
This diff is collapsed.
Click to expand it.
app/views/profiles/keys/new.html.haml
View file @
76aca721
This diff is collapsed.
Click to expand it.
app/views/projects/_home_panel.html.haml
View file @
76aca721
...
...
@@ -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:
'Go
t
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
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/repositories/_download_archive.html.haml
View file @
76aca721
This diff is collapsed.
Click to expand it.
db/fixtures/development/10_merge_requests.rb
View file @
76aca721
...
...
@@ -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'
,
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment