9e9ce95d62
Conflicts: app/views/dashboard/_project.html.haml app/views/events/event/_common.html.haml app/views/explore/projects/_project.html.haml app/views/groups/_projects.html.haml app/views/projects/_home_panel.html.haml app/views/projects/_issues_nav.html.haml app/views/projects/issues/_discussion.html.haml app/views/projects/issues/_issues.html.haml app/views/projects/issues/show.html.haml app/views/projects/merge_requests/_discussion.html.haml app/views/projects/merge_requests/_show.html.haml app/views/projects/milestones/index.html.haml app/views/projects/notes/_edit_form.html.haml app/views/shared/_issuable_filter.html.haml |
||
---|---|---|
.. | ||
admin | ||
atom | ||
security | ||
gitlab_flavored_markdown_spec.rb | ||
help_pages_spec.rb | ||
issues_spec.rb | ||
notes_on_merge_requests_spec.rb | ||
profile_spec.rb | ||
projects_spec.rb | ||
search_spec.rb | ||
users_spec.rb |