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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
362d82d1
Commit
362d82d1
authored
Apr 05, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prevent same branch in MR seeds
parent
38d23c0e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
app/views/merge_requests/show/_commits.html.haml
app/views/merge_requests/show/_commits.html.haml
+3
-3
db/fixtures/development/10_merge_requests.rb
db/fixtures/development/10_merge_requests.rb
+2
-0
No files found.
app/views/merge_requests/show/_commits.html.haml
View file @
362d82d1
...
...
@@ -22,9 +22,9 @@
=
render
"commits/commit"
,
commit:
commit
-
else
%h
5
%h
4
.nothing_here_message
Nothing to merge from
%span
.label
#{
@merge_request
.
source_branch
}
%span
.label
-branch
#{
@merge_request
.
source_branch
}
to
%span
.label
#{
@merge_request
.
target_branch
}
%span
.label
-branch
#{
@merge_request
.
target_branch
}
%br
db/fixtures/development/10_merge_requests.rb
View file @
362d82d1
...
...
@@ -14,6 +14,8 @@ Gitlab::Seeder.quiet do
branches
=
project
.
repository
.
branch_names
.
sample
(
2
)
next
if
branches
.
uniq
.
size
<
2
user_id
=
user
.
id
MergeRequestObserver
.
current_user
=
user
MergeRequest
.
seed
(
:id
,
[{
...
...
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