diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-07-11 19:16:42 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:41 +0300 |
| commit | 907317c457754db691a88a77845121ac517917d5 (patch) | |
| tree | 23e2a3214ceaa38a0a532911bb8504263f6b5ab5 /app/helpers | |
| parent | 1db31dbe4660ed893f1bf4eb2545b1c52ef0725b (diff) | |
| download | gitlab-ce-907317c457754db691a88a77845121ac517917d5.tar.gz | |
Added routes for conflicts in merge requests page.
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/nav_helper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index 3ff8be5e284..6c1cc6ef072 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -24,6 +24,7 @@ module NavHelper current_path?('merge_requests#diffs') || current_path?('merge_requests#commits') || current_path?('merge_requests#builds') || + current_path?('merge_requests#conflicts') || current_path?('issues#show') if cookies[:collapsed_gutter] == 'true' "page-gutter right-sidebar-collapsed" |