gitlab-org--gitlab-foss/app/views
Annabel Dunstone Gray a1ae0f7ce8 Merge branch 'edit-button-wiki' into 'master'
Fix edit button in wiki

## What does this MR do?

Fix edit button in wiki.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

## Screenshots (if relevant)

### Show Wiki

![wiki_show](/uploads/7633b7de9921cb8abe688a11883b8d1d/wiki_show.png)

### Edit Wiki

![wiki_edit](/uploads/2529bb1d5eb5b33ef97da89e634bb8ad/wiki_edit.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

Closes #13444

See merge request !7143
2016-11-02 13:32:18 +00:00
..
abuse_report_mailer
abuse_reports
admin Merge branch '23545-distorted-images' into 'master' 2016-11-01 20:52:06 +00:00
award_emoji
ci/lints
dashboard Changed where merge request link is 2016-11-01 08:47:27 +00:00
devise Merge branch 'register-tab' into 'master' 2016-10-25 02:47:27 +00:00
discussions
doorkeeper
email_rejection_mailer
emojis
errors
events
explore
groups 23545 Fix distorted project and group avatars 2016-11-01 10:59:04 -05:00
help Fix typo on /help/ui to Alerts section 2016-10-26 12:41:54 +02:00
import
invites
issues
kaminari/gitlab Makes table pagination responsive 2016-11-01 16:24:54 +00:00
koding
layouts Update links in side nav and header 2016-11-01 10:58:07 -05:00
notify
profiles
projects Merge branch 'edit-button-wiki' into 'master' 2016-11-02 13:32:18 +00:00
repository_check_mailer
search
sent_notifications
shared Merge branch '23713-milestone-dropdown-not-selected' into 'master' 2016-11-02 10:51:44 +00:00
sherlock
snippets
u2f
users Fix haml_lint 2016-11-01 12:30:51 -05:00