Commit e75f4c9c authored by Sean McGivern's avatar Sean McGivern

Fix squash doc links

* 'Learn more' should be 'about this feature'
* The feature is to squash and merge at once, not squash before merge
parent ee957d3a
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
= hidden_field_tag :squash, '0', id: nil = hidden_field_tag :squash, '0', id: nil
= check_box_tag :squash, '1', @merge_request.squash = check_box_tag :squash, '1', @merge_request.squash
Squash commits Squash commits
= link_to icon('question-circle'), help_page_path('user/project/merge_requests/squash_before_merge'), title: 'Learn more', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} = link_to icon('question-circle'), help_page_path('user/project/merge_requests/squash_and_merge'), title: 'About this feature', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'}
.accept-control .accept-control
- if @project.merge_requests_ff_only_enabled - if @project.merge_requests_ff_only_enabled
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
= hidden_field_tag 'merge_request[squash]', '0', id: nil = hidden_field_tag 'merge_request[squash]', '0', id: nil
= check_box_tag 'merge_request[squash]', '1', issuable.squash = check_box_tag 'merge_request[squash]', '1', issuable.squash
Squash commits when merge request is accepted. Squash commits when merge request is accepted.
= link_to 'Learn more', help_page_path('user/project/merge_requests/squash_before_merge') = link_to 'About this feature', help_page_path('user/project/merge_requests/squash_and_merge')
# Squash before merge # Squash and merge
Documentation forthcoming. Documentation forthcoming.
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