diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-04 14:58:16 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-04 14:58:16 +0000 |
| commit | 0fe6d5b49e211a1f80cd5e42bcb8a07481dab82e (patch) | |
| tree | fcfe8c09619152c0b23115fd21a018850e6e4186 /app/views/projects/merge_requests/_show.html.haml | |
| parent | fdbdd45d22c47c5b14b9ddc59d1a309bd2d7d9ce (diff) | |
| parent | 9c49a1812aaa7e858295be5abbf9e1a7c1346699 (diff) | |
| download | gitlab-ce-0fe6d5b49e211a1f80cd5e42bcb8a07481dab82e.tar.gz | |
Merge branch 'master' into fe-commit-mr-pipelines
* master: (76 commits)
fix failing test
fix Vue warnings for missing element
[ci skip] UX Guide: Button placement in groups
Change window size before visiting page, to get correct scroll position
Fix slash commands spec error
Move project services to new location under Integrations
Move webhooks to new a location under Integrations
Fixed redirection from http://someproject.git to http://someproject
consistently use single quotes
allow application.js to require other scripts which start with application*
DRY with Gitlab.config.webpack.dev_server references
disable webpack proxy in rspec environment due to conflicts with webmock gem
remove changes to Procfile
configure webpack dev server port via environment variable
add rack middleware to proxy webpack dev server
remove dev-server config from development environment
Document that the retro and kickoff notes are public
add CHAGELOG.md entry for webpack branch
fix failing rspec build
fix test failure for merge request widget
...
Diffstat (limited to 'app/views/projects/merge_requests/_show.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index cc4b1f58b27..83250443bea 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -3,8 +3,8 @@ - page_description @merge_request.description - page_card_attributes @merge_request.card_attributes - content_for :page_specific_javascripts do - = page_specific_javascript_tag('lib/vue_resource.js') - = page_specific_javascript_tag('diff_notes/diff_notes_bundle.js') + = page_specific_javascript_bundle_tag('lib_vue') + = page_specific_javascript_bundle_tag('diff_notes') .merge-request{ 'data-url' => merge_request_path(@merge_request) } = render "projects/merge_requests/show/mr_title" |