diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 00:08:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 00:08:56 +0300 |
| commit | c1924b863ad66503edbaa3325949bce6b023b737 (patch) | |
| tree | d6ab8e583d5cdb0849e10677c6223f4efbeca993 /app/assets | |
| parent | 6315ed9630fb1c6ade3114beb762cd1568d79219 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/ide/stores/actions/file.js | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/repository/log_tree.js | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/snippets.scss | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js index 76e09f96bd6..55ee8a699c8 100644 --- a/app/assets/javascripts/ide/stores/actions/file.js +++ b/app/assets/javascripts/ide/stores/actions/file.js @@ -71,6 +71,7 @@ export const getFileData = ( const url = joinPaths( gon.relative_url_root || '/', state.currentProjectId, + '-', file.type, getters.lastCommit && getters.lastCommit.id, escapeFileUrl(file.prevPath || file.path), diff --git a/app/assets/javascripts/repository/log_tree.js b/app/assets/javascripts/repository/log_tree.js index 6498725adb6..2a66659fecb 100644 --- a/app/assets/javascripts/repository/log_tree.js +++ b/app/assets/javascripts/repository/log_tree.js @@ -27,7 +27,7 @@ export function fetchLogsTree(client, path, offset, resolver = null) { fetchpromise = axios .get( - `${gon.relative_url_root}/${projectPath}/refs/${ref}/logs_tree/${path.replace(/^\//, '')}`, + `${gon.relative_url_root}/${projectPath}/-/refs/${ref}/logs_tree/${path.replace(/^\//, '')}`, { params: { format: 'json', offset }, }, diff --git a/app/assets/stylesheets/framework/snippets.scss b/app/assets/stylesheets/framework/snippets.scss index 404f60f17ee..fbe241df32f 100644 --- a/app/assets/stylesheets/framework/snippets.scss +++ b/app/assets/stylesheets/framework/snippets.scss @@ -1,6 +1,7 @@ .snippet-row { .title { margin-bottom: 2px; + font-weight: $gl-font-weight-bold; } .snippet-filename { @@ -11,6 +12,10 @@ .snippet-info { color: $gl-text-color-secondary; } + + a { + color: $gl-text-color; + } } .snippet-form-holder .file-holder .file-title { |