diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-15 02:46:55 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-15 02:46:55 +0000 |
| commit | 2f35ba98fae6e0b58b196e3fbbe00e6ee703cbe8 (patch) | |
| tree | b67a98e00b59bd1a785ffb3fdccf0336c6c92d7d /app/views/shared/_mr_head.html.haml | |
| parent | e22bd9650d7bebfea0909fdaf5be7dcf746b53f7 (diff) | |
| parent | 309bab431075eabfb7a01300f946ce9eb5b6fb98 (diff) | |
| download | gitlab-ce-2f35ba98fae6e0b58b196e3fbbe00e6ee703cbe8.tar.gz | |
Merge branch 'master' into 'add-sentry-js-again-with-vue'
# Conflicts:
# app/views/layouts/_head.html.haml
# config/webpack.config.js
Diffstat (limited to 'app/views/shared/_mr_head.html.haml')
| -rw-r--r-- | app/views/shared/_mr_head.html.haml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/shared/_mr_head.html.haml b/app/views/shared/_mr_head.html.haml new file mode 100644 index 00000000000..4211ec6351d --- /dev/null +++ b/app/views/shared/_mr_head.html.haml @@ -0,0 +1,4 @@ +- if @project.default_issues_tracker? + = render "projects/issues/head" +- else + = render "projects/merge_requests/head" |