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
ca0c05c4
Commit
ca0c05c4
authored
Jan 24, 2017
by
Ryan Harris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed builds info link on project settings page
parent
1fe80c29
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
app/views/projects/_merge_request_merge_settings.html.haml
app/views/projects/_merge_request_merge_settings.html.haml
+1
-1
changelogs/unreleased/27178-update-builds-link-in-project-settings.yml
...released/27178-update-builds-link-in-project-settings.yml
+4
-0
No files found.
app/views/projects/_merge_request_merge_settings.html.haml
View file @
ca0c05c4
...
...
@@ -8,7 +8,7 @@
%br
%span
.descr
Builds need to be configured to enable this feature.
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'user/project/merge_requests/merge_when_
build_succeeds'
,
anchor:
'only-allow-merge-requests-to-be-merged-if-the-build-succeeds
'
)
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'user/project/merge_requests/merge_when_
pipeline_succeeds.md
'
)
.checkbox
=
form
.
label
:only_allow_merge_if_all_discussions_are_resolved
do
=
form
.
check_box
:only_allow_merge_if_all_discussions_are_resolved
...
...
changelogs/unreleased/27178-update-builds-link-in-project-settings.yml
0 → 100644
View file @
ca0c05c4
---
title
:
Updated builds info link on the project settings page
merge_request
:
author
:
Ryan Harris
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