diff options
| author | Regis <boudinot.regis@yahoo.com> | 2017-03-21 09:08:28 -0600 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-03-21 09:08:28 -0600 |
| commit | 0b75b821c6cfd173291fcfd88c41da9922d082dd (patch) | |
| tree | 41b578d299bd77423aa3591955a4cb5ca07ab025 /app/helpers/nav_helper.rb | |
| parent | 6342da7bb6cbba1b1e026fc62a1da42b811b25f4 (diff) | |
| parent | a08c707c928092426e2334423e71c6b841309ddf (diff) | |
| download | gitlab-ce-issue-title-vue.tar.gz | |
update to current master and fix conflictsissue-title-vue
Diffstat (limited to 'app/helpers/nav_helper.rb')
| -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 c1523b4dabf..a8f167cbff2 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -16,6 +16,7 @@ module NavHelper "page-gutter build-sidebar right-sidebar-expanded" elsif current_path?('wikis#show') || current_path?('wikis#edit') || + current_path?('wikis#update') || current_path?('wikis#history') || current_path?('wikis#git_access') "page-gutter wiki-sidebar right-sidebar-expanded" |