diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-15 14:33:14 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-15 14:33:14 +0000 |
| commit | 90e91e28e40f2d5d5205e62f6e01e23af4da117f (patch) | |
| tree | b745cd4a914d2bef8dd9559f6aa8b2d0b15c7414 /app/views/layouts/nav | |
| parent | ea7d062fa60e3e622288237fc66a815348bbcf36 (diff) | |
| parent | 8f21e2ae408a4ebd0e115846b9a639e7ce09a126 (diff) | |
| download | gitlab-ce-90e91e28e40f2d5d5205e62f6e01e23af4da117f.tar.gz | |
Merge branch 'application-settings' into 'master'
Applications tab on profile settings
Closes #13855
See merge request !3031
Diffstat (limited to 'app/views/layouts/nav')
| -rw-r--r-- | app/views/layouts/nav/_profile.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml index f3ded04419b..3b9d31a6fc5 100644 --- a/app/views/layouts/nav/_profile.html.haml +++ b/app/views/layouts/nav/_profile.html.haml @@ -17,7 +17,7 @@ = icon('gear fw') %span Account - = nav_link(path: ['profiles#applications', 'applications#edit', 'applications#show', 'applications#new', 'applications#create']) do + = nav_link(controller: 'oauth/applications') do = link_to applications_profile_path, title: 'Applications' do = icon('cloud fw') %span |