kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'sh-remove-trailing-lines' into 'master' 

Remove trailing newline that was causing an EE conflict

See merge request gitlab-org/gitlab-ce!17465
This commit is contained in:
Jacob Schatz 2018-03-01 23:27:31 +00:00
parent 5c4eace67f 77346c1955
commit 257af80e45
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/pages/projects/issues/show.js
View File

@ -11,4 +11,3 @@ export default function () {
new ZenMode(); // eslint-disable-line no-new
initIssuableSidebar();
}

1
app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js
View File

@ -30,4 +30,3 @@ export default function () {
howToMerge();
initWidget();
}