diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-18 21:07:37 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-18 21:07:37 +0000 |
| commit | 7f8330873c1a5860b8a9a52d111083a65d210249 (patch) | |
| tree | e6c7019f2942b8d2fff313545b7cb4bb996b6870 /app/assets/javascripts/merge_request_tabs.js | |
| parent | bbe243060399191abcba33c7ebd611f6ec34c6cd (diff) | |
| download | gitlab-ce-7f8330873c1a5860b8a9a52d111083a65d210249.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/merge_request_tabs.js')
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 8d09e88e772..52674107df2 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -32,17 +32,17 @@ import { __ } from './locale'; // // <ul class="nav-links merge-request-tabs"> // <li class="notes-tab active"> -// <a data-action="notes" data-target="#notes" data-toggle="tab" href="/foo/bar/-/merge_requests/1"> +// <a data-action="notes" data-target="#notes" data-toggle="tab" href="/foo/bar/merge_requests/1"> // Discussion // </a> // </li> // <li class="commits-tab"> -// <a data-action="commits" data-target="#commits" data-toggle="tab" href="/foo/bar/-/merge_requests/1/commits"> +// <a data-action="commits" data-target="#commits" data-toggle="tab" href="/foo/bar/merge_requests/1/commits"> // Commits // </a> // </li> // <li class="diffs-tab"> -// <a data-action="diffs" data-target="#diffs" data-toggle="tab" href="/foo/bar/-/merge_requests/1/diffs"> +// <a data-action="diffs" data-target="#diffs" data-toggle="tab" href="/foo/bar/merge_requests/1/diffs"> // Diffs // </a> // </li> @@ -260,17 +260,17 @@ export default class MergeRequestTabs { // // Examples: // - // location.pathname # => "/namespace/project/-/merge_requests/1" + // location.pathname # => "/namespace/project/merge_requests/1" // setCurrentAction('diffs') - // location.pathname # => "/namespace/project/-/merge_requests/1/diffs" + // location.pathname # => "/namespace/project/merge_requests/1/diffs" // - // location.pathname # => "/namespace/project/-/merge_requests/1/diffs" + // location.pathname # => "/namespace/project/merge_requests/1/diffs" // setCurrentAction('show') - // location.pathname # => "/namespace/project/-/merge_requests/1" + // location.pathname # => "/namespace/project/merge_requests/1" // - // location.pathname # => "/namespace/project/-/merge_requests/1/diffs" + // location.pathname # => "/namespace/project/merge_requests/1/diffs" // setCurrentAction('commits') - // location.pathname # => "/namespace/project/-/merge_requests/1/commits" + // location.pathname # => "/namespace/project/merge_requests/1/commits" // // Returns the new URL String setCurrentAction(action) { |