* upstream/master: (26 commits)
  Add a `--force` option to bin/changelog
  Update examples in changelog docs to use single quotes around title
  Use the server's base URL without relative URL part when creating links in JIRA
  Make ESLint ignore instrumented files for coverage analysis (!7236)
  Check that JavaScript file names match convention (!7238)
  Removed z-index for filters on issue boards
  GitLab 8.13 not 13
  Replace MR Description Format links
  Fix gdb backtrace command
  Update gitlab.yml.example
  remove extra spaces from app/workers/post_receive.rb
  Add Rake task to create/repair GitLab Shell hooks symlinks
  Added guide for upgrading Postgres using Slony
  Ensure hook tokens are write-only in the API
  Add support for token attr in project hooks API
  Add a CHANGELOG entry
  Fix edit button wiki
  Updated Sortable JS plugin
  Allow owners to fetch source code in CI builds
  fixes milestone dropdown not select issue
  ...

Add a `--force` option to bin/changelog

See merge request !7252

Check that JavaScript file names match convention

## What does this MR do?

Introduce a new ESLint rule to check JavaScript file names.

## What are the relevant issue numbers?

fixes #23118

See merge request !7238

Updated Sortable JS plugin

## What does this MR do?

Updates Sortable JS plugin for issue boards. The older version stopped the issue cards being draggable.

## What are the relevant issue numbers?

Closes #23048

See merge request !6734

Removes spaces in log messages.

refs:
- 6f7ccea6
- 7121a58e
- f54bf003

none of them seem to have added extra space deliberately (commit message is about something else)

## Why was this MR needed?

The spaces caused confusion when trying to analyze the logs, there was no space in user name, but log message indicated there was.

See merge request !7223

Update examples in changelog docs to use single quotes around title

[ci skip]

See merge request !7246

[ci skip]

Removed z-index for filters on issue boards

## What does this MR do?

I dont know how this is has only just become a problem, but when the sidebar is open the filters on issue boards overlap it.

## Screenshots (if relevant)

### Before

![Screen_Shot_2016-11-02_at_09.50.59](/uploads/430ec15249b866999e83fe402cd9bd35/Screen_Shot_2016-11-02_at_09.50.59.png)

### After

![Screen_Shot_2016-11-02_at_09.49.40](/uploads/3a417570a874197ce4b66cbfadbf8181/Screen_Shot_2016-11-02_at_09.49.40.png)

See merge request !7235

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

Add a bin/changelog script and changelog documentation

See merge request !7098

Make ESLint ignore instrumented files for coverage analysis

## What does this MR do?
 
Ignore files in `coverage-javascript/` directory.

## Why was this MR needed?

When running ESLint after coverage analysis locally, it led to many linting errors. CI was not affected (ESLint and coverage are different jobs).

See merge request !7236

Update diffy gem to 3.1.0

See merge request !7184

Use the server's base URL without relative URL part when creating links
in JIRA

Closes #17846

See merge request !6143

Signed-off-by: Rémy Coutable <remy@rymai.me>

Replace links to the `Merge request description format` section with
up-to-date instructions on using the MR template built into the UI.

The `Merge request description format` section was removed in 2f7e28d1,
but links were left in the table of contents and in the MR description
instructions. Presumably, the section was removed because MR templates
are now provided by the GitLab UI.

See merge request !7228

Explains the problem instead of Yelling.

The relevant part that fails is in gitlab-shell:
https://gitlab.com/gitlab-org/gitlab-shell/blob/v3.6.6/hooks/post-receive#L8

See merge request !7224

Updates rack-attack gem to 4.4.1

See merge request !7186

GitLab 8.13 not 13

cc// @felipe_artur

See merge request !7234

Fix gdb backtrace command

See merge request !7227

add container registry images to not exported list

See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html

## What does this MR do?

Clarify that images are not exported

See merge request !7187

This MR adds support for the `token` attribute in the project hook API.

Feature requested on a dependant project: https://github.com/gpocentek/python-gitlab/issues/170

See merge request !7220

Added guide for upgrading Postgres using Slony

## What does this MR do?

This adds a guide for upgrading PostgreSQL using Slony.

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

Spelling, grammar, etc

## Why was this MR needed?

This process is not documented and we'll need to provide steps on how to do this before we start shipping PostgreSQL 9.6 with omnibus-gitlab.

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

cc @pcarranza @marin @axil

See merge request !6711

Milestone dropdown does not stay selected

Closes #23713

See merge request !7117

Add Rake task to create/repair GitLab Shell hooks symlinks

## What does this MR do?

Adds a Rake task wrapper around `gitlab-shell` `bin/create_hooks` script. This makes it easier for an administrator to repair hooks symlinks without worrying about where repository data is located, etc. Just run this task and it takes care of everything based on current configuration. 

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

No.

## Why was this MR needed?

`bin/create_hooks` was not well-documented. It requires parameters specifying where repository data is located. It also needs to be run by the `git` user. Wrapping it in a Rake task allows us to take current configuration in to account and makes it easier on the administrator. 


See merge request !5634

Allow owners to fetch source code in CI builds

Due to different way of handling owners of a project, they were not allowed to fetch CI sources for project.

This adds a separate code path for handling owners, that are not admins.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23437

See merge request !6943

* upstream/master: (216 commits)
  Remove invalid changelog entries
  require rails/generators for generators
  Adds variable. Fixes changelog
  Fix haml_lint
  Fixes after review
  Update changelog
  Remove tooltips from project header
  Makes table pagination responsive
  23545 Fix distorted project and group avatars
  Fix spinach tests
  Update links in side nav and header
  Allow to search for user by secondary email address in the admin interface
  Rename :name search parameter to :search_query at /admin/users
  Initialize Sidekiq with the list of queues used by GitLab
  Fix project features default values
  Add a link to the Issue Boards API in main README
  Add validation errors to Merge Request form
  Fix Markdown styling inside reference links
  Fix relative links in Markdown wiki when displayed in "Project" tab
  Adds label description to issue board title
  ...

Remove invalid changelog entries

Fixes current CHANGELOG.md in master

See merge request !7231

Resolve "Tables pagination is not responsive"

## What does this MR do?
Makes table pagination responsive.

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

## Why was this MR needed?
Table pagination was not responsive and was broken in smaller screens

## Screenshots (if relevant)
### Small screen
![small](/uploads/912c6813596ef9f992b3bf5a9ba141f1/small.png)
![small_big_numbers](/uploads/5add4c2ead1bd3fbf9f15f66e2dad178/small_big_numbers.png)

### Medium screen
![medium](/uploads/77774be45d83ad9bba127d0e020e2d48/medium.png)

### Large screen
![big](/uploads/ea30d115e7e2b915626faafa425687f6/big.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
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?
Closes #23053

See merge request !7157

Resolve "Improve build "Retry" button on Build Page"

* On desktop, adds retry button on build page header
* On mobile, adds retry button in sidebar

![Screen_Shot_2016-10-28_at_1.35.07_PM](/uploads/2f9f87a9fc3e85c9aafc8c3d7a231639/Screen_Shot_2016-10-28_at_1.35.07_PM.png)
![Screen_Shot_2016-10-26_at_1.01.44_PM](/uploads/d02ce3a422a505b14ab357f695de8bba/Screen_Shot_2016-10-26_at_1.01.44_PM.png)

Closes #23273

See merge request !7126

Replace links to the `Merge request description format` section with
up-to-date instructions on using the MR template built into the UI.

The `Merge request description format` section was removed in 2f7e28d1,
but links were left in the table of contents and in the MR description
instructions.