gitlab-org--gitlab-foss/app/views/projects/merge_requests/show
Douwe Maan 10387f6b8a Merge branch 'master' into tmp-reference-pipeline-and-caching
# Conflicts:
#	spec/lib/gitlab/markdown/autolink_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/cross_project_reference_spec.rb
#	spec/lib/gitlab/markdown/emoji_filter_spec.rb
#	spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/external_link_filter_spec.rb
#	spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/label_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/redactor_filter_spec.rb
#	spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
#	spec/lib/gitlab/markdown/relative_link_filter_spec.rb
#	spec/lib/gitlab/markdown/sanitization_filter_spec.rb
#	spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
#	spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
#	spec/lib/gitlab/markdown/task_list_filter_spec.rb
#	spec/lib/gitlab/markdown/upload_link_filter_spec.rb
#	spec/lib/gitlab/markdown/user_reference_filter_spec.rb
2015-12-10 14:04:34 +01:00
..
_builds.html.haml Add Builds tab to MR detail page 2015-12-08 13:11:41 +01:00
_commits.html.haml Remove duplicated styling for center top menus 2015-12-02 14:49:12 +01:00
_diffs.html.haml Add ignore white space option in merge request diff 2015-11-13 16:53:53 +09:00
_how_to_merge.html.haml Add clipboard buttons to each step of "How to merge" 2015-10-23 15:44:39 +02:00
_mr_box.html.haml Cache rendered contents of issues, MRs and notes 2015-10-14 21:29:35 +02:00
_mr_title.html.haml Use "opened by" instead of "created by" in issue/MR header, like in list 2015-12-02 14:22:11 +01:00