diff options
| author | Phil Hughes <me@iamphill.com> | 2017-10-31 10:18:56 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-10-31 10:18:56 +0000 |
| commit | 307883a5eb582ac203fe0777fcb11fa7d6c3ddca (patch) | |
| tree | c5056641a35655d05c671ed4b67858aea4d1d196 | |
| parent | ac8e94d4d56d98f9e4c3b7c0f331eaa6fa5a4312 (diff) | |
| download | gitlab-ce-307883a5eb582ac203fe0777fcb11fa7d6c3ddca.tar.gz | |
get branch name from the DOM
| -rw-r--r-- | app/assets/javascripts/repo/index.js | 5 | ||||
| -rw-r--r-- | app/views/shared/repo/_repo.html.haml | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/repo/index.js b/app/assets/javascripts/repo/index.js index 480d46eab81..b6801af7fcb 100644 --- a/app/assets/javascripts/repo/index.js +++ b/app/assets/javascripts/repo/index.js @@ -9,6 +9,8 @@ import store from './stores'; import Translate from '../vue_shared/translate'; function initRepo(el) { + if (!el) return null; + return new Vue({ el, store, @@ -38,8 +40,7 @@ function initRepo(el) { onTopOfBranch: convertPermissionToBoolean(data.onTopOfBranch), currentRef: data.ref, path: data.currentPath, - // TODO: get through data attribute - currentBranch: document.querySelector('.js-project-refs-dropdown').dataset.ref, + currentBranch: data.currentBranch, isRoot: convertPermissionToBoolean(data.root), isInitialRoot: convertPermissionToBoolean(data.root), }); diff --git a/app/views/shared/repo/_repo.html.haml b/app/views/shared/repo/_repo.html.haml index c1ba1cfefba..5867ea58378 100644 --- a/app/views/shared/repo/_repo.html.haml +++ b/app/views/shared/repo/_repo.html.haml @@ -1,6 +1,7 @@ #repo{ data: { root: @path.empty?.to_s, root_url: project_tree_path(project), url: content_url, + current_branch: @ref, ref: @commit.id, project_name: project.name, project_url: project_path(project), |