diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-31 09:06:29 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-31 09:06:29 +0000 |
| commit | 6026bddcd51eca573c530240c421392045172b89 (patch) | |
| tree | 30cb1134ac00a336e6cfaa81bbafe6cd1360f58f /app | |
| parent | b7c776f95d5f41ac00986073563ad0c1de4bad44 (diff) | |
| download | gitlab-ce-6026bddcd51eca573c530240c421392045172b89.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/jobs/store/utils.js | 2 | ||||
| -rw-r--r-- | app/views/help/_shortcuts.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/jobs/store/utils.js b/app/assets/javascripts/jobs/store/utils.js index 58e49f54d96..179d0bc4e0f 100644 --- a/app/assets/javascripts/jobs/store/utils.js +++ b/app/assets/javascripts/jobs/store/utils.js @@ -17,7 +17,7 @@ export const parseLine = (line = {}, lineNumber) => ({ * @param Number lineNumber */ export const parseHeaderLine = (line = {}, lineNumber) => ({ - isClosed: true, + isClosed: false, isHeader: true, line: parseLine(line, lineNumber), lines: [], diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml index f1ba804f920..5f8f2333e40 100644 --- a/app/views/help/_shortcuts.html.haml +++ b/app/views/help/_shortcuts.html.haml @@ -218,7 +218,7 @@ %tr %td.shortcut %kbd esc - %td= _('Go back (while searching for files') + %td= _('Go back (while searching for files)') %tr %td.shortcut %kbd y |