https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347/diffs#note_13173445

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347/diffs#note_13173429

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347/diffs#note_13173368
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347/diffs#note_13173370

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347/diffs#note_13173345

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347/diffs#note_13173336

let! is not very flexible but I guess it's fine since this is not in
top-level anyway.

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347/diffs#note_13173304

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347/diffs#note_13173284

Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5347#note_13170854

* master: (23 commits)
  Add CHANGELOG entry [ci skip]
  CHANGELOG item
  Added redirect_to_referer to login link on issues
  Simplify entities for branches and tags API
  Added Rake task for tracking deployments
  Return the number of marked todos
  Use local_assigns
  Use `humanize`
  Improve code design
  Remove unused create_pipeline_service_spec.rb
  Add notice implementation
  Make manual actions to work with master code
  Use `capitalize` instead of `titleize` for manual actions
  Mark builds with manual actions as skipped
  Fix rubocop offenses
  Update build fixtures to include manual actions
  Improve manual actions code and add model, service and feature tests
  Rename playable_actions to manual_actions
  Add implementation of manual actions
  Position commit icons closer to branch name/tag/sha; add min-width to pipeline actions cell
  ...

Added redirect_to_referer to login link on issues

## What does this MR do?

Adds a `redirect_to_referer` param to login & register links on issues when not logged in. This makes the login box redirect back to the issue after login.

## What are the relevant issue numbers?

Closes #19968 

See merge request !5344

This was extracted from !5142 and implementing part of #4255.
We split it from !5142 because we want to ship it in 8.10
while !5142 was not ready yet.

Add support for manual CI actions

## What does this MR do?
This implements a `when: manual` which allows a jobs to be marked as manual actions.
Manual actions have to be explicitly executed by developers.

## What are the relevant issue numbers?
This is to solve: https://gitlab.com/gitlab-org/gitlab-ce/issues/17010

See merge request !5297

Simplify entities for branches and tags API

## What does this MR do?

As talked in !5208, I improved the entity for branches and tags.

## Does this MR meet the acceptance criteria?

~~- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)~~
~~- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)~~
~~- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)~~

See merge request !5343

Resolve "Add icons for branch and tag in pipeline list"

## What does this MR do?
Adds branch or tag icon on pipeline ref

## What are the relevant issue numbers?
Closes #19751    
Part of #18920 

## Screenshots (if relevant)
![Screen_Shot_2016-07-13_at_1.42.54_PM](/uploads/d90706a76cf87a6cc8c25dca9a71affa/Screen_Shot_2016-07-13_at_1.42.54_PM.png)

With icons closer to tag/branch name/sha:   
![Screen_Shot_2016-07-15_at_11.23.48_AM](/uploads/411338f811bafbd314dbab5553fa46d4/Screen_Shot_2016-07-15_at_11.23.48_AM.png)

See merge request !5239

Added Rake task for tracking deployments

## What does this MR do?

This MR adds a Rake task to track the current version of GitLab in InfluxDB.

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

We may want to document this Rake task in some Markdown file, but I'm not sure what the best place for this would be.

## Why was this MR needed?

We want to have a more accurate overview of when deployments occurred. 

## What are the relevant issue numbers?

https://gitlab.com/gitlab-com/infrastructure/issues/98

## 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] ~~API support added~~
- [x] 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 you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5320

Closes #19968

Api delete todos

## What does this MR do?

It changes the `DELETE /todos` to only return the number of marked todos.

## Why was this MR needed?

Before it returned the marked todos as an paginated array. Since we deleted/marked the todos, there was no way to get the rest of the todos.

## What are the relevant issue numbers?

Closes #19678

## 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] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [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)

See merge request !5341

This simply inserts the current GitLab version in the "deployments"
measurement.

Fixes gitlab-com/infrastructure#98

Change color of today issue highlight



See merge request !5329

API: Expose 'developers_can_push' for branches

## What does this MR do?

Adds support for the `developers_can_push` flag for the branches API. It also supports creating protected branches with that flag.

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

The API call requires an optional boolean parameter `developers_can_push`. If it is not either `true` or `false`, it should not update the value. I'm not sure if this is the right way to do it.

Right now it always returns `200`. Maybe the `PUT` method should return different status codes depending if it really created or updated a branch.

## What are the relevant issue numbers?

Closes #12735 

## 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] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [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)

See merge request !5208

Fix MR diff encoding issues exporting projects

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19338

See merge request !5039

WIP - trying to replicate UTF-8 error

fix spec

fixing encoding issue and another spec, to do with MR diffs

fix issue and spec failure

Add changelog and bumped up I/E version

fix spec based on feedback - omitted target project

Small ui improvements

* make file tree row 2px smaller for more compact view
* make sub navigation  background a bit darker for better contrast with main navigation

cc @hazelyang @alfredo1 

See merge request !5315

Update documentation for build artifact dependencies

## What does this MR do?

Update documentation for build artifact dependencies

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

## Why was this MR needed?

#19892 

## What are the relevant issue numbers?

#19892 

## Screenshots (if relevant)


See merge request !5332

Update MAINTENANCE.md with our latest policy

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19958

See merge request !5339

[ci skip]

Fix of 'Commits being passed to custom hooks are already reachable when using the UI'

This is back-port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/563

## What does this MR do?
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19771
This MR changes the way how we create commit, we create it directly in the branch and we don't use temporary ref anymore. This also works similar to how `git-receive-pack` works so it's a natural way to create commit.


## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/19771

See merge request !5337

Upgrade gemojione to 3.0.0

Upgrades gemojione to 3.0.0, see the Changelog: https://github.com/jonathanwiesel/gemojione/blob/b98aa8b07eef815d4d3f52ff3c8714b28932b0de/CHANGELOG.md#v300-2016-07-12

[Here are all the new 2016 emoji](http://emojione.com/releases/2.2.4/) 🎉

This update has new emoji and more sensical categories.

See merge request !5237

Fixed the alignment in the MR widget

## What does this MR do?

Fixes the alignment of the browse button in the MR widget

## Screenshots (if relevant)

![Screen_Shot_2016-07-17_at_17.47.54](/uploads/41dcb0fad38fdd4dbccfda5ffaeaec6e/Screen_Shot_2016-07-17_at_17.47.54.png)

See merge request !5307

Blurs the clicked link in dropdown menus

## What does this MR do?

This fixes an issue where the dropdown menu would stay visible even when clicked out of it

See merge request !5322

Improve cron_jobs loading error messages

## What does this MR do?

Improves the error message from "Sidekiq Cron Jobs" plugin, when trying to load a incorrect definition from gitlab config files.

This is the output before the fix:

```
2016-06-08T16:43:19.277Z 2890 TID-gso49ojro INFO: Booting Sidekiq 4.1.2 with redis options {:url=>"unix:/var/run/redis/redis.sock", :namespace=>"resque:gitlab"}
undefined method `delete' for nil:NilClass
/home/git/gitlab/config/initializers/sidekiq.rb:16:in `block (2 levels) in <top (required)>'
/home/git/gitlab/config/initializers/sidekiq.rb:16:in `each'
/home/git/gitlab/config/initializers/sidekiq.rb:16:in `block in <top (required)>'
/home/git/gitlab/vendor/bundle/ruby/2.1.0/gems/sidekiq-4.1.2/lib/sidekiq.rb:70:in `configure_server'
```

This is the output after the fix:

```
2016-07-18T10:53:22.414Z 66332 TID-oxal1bmik INFO: Booting Sidekiq 4.1.4 with redis options {:url=>"redis://localhost:6378", :namespace=>"resque:gitlab"}
Invalid cron_jobs config key: 'registry'. Check your gitlab config file.
/home/git/gitlab/config/initializers/sidekiq.rb:21:in `block (2 levels) in <top (required)>'
/home/git/gitlab/config/initializers/sidekiq.rb:17:in `each'
/home/git/gitlab/config/initializers/sidekiq.rb:17:in `block in <top (required)>'
/home/git/gitlab/vendor/bundle/ruby/2.1.0/gems/ruby-2.1.8/gems/sidekiq-4.1.4/lib/sidekiq.rb:70:in `configure_server'
```

Fixes #18378

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

No

## Why was this MR needed?

Original error doesn't give any hint on where the problem can be, so the user can't easily troubleshoot unless he knows implementation details.

## What are the relevant issue numbers?

#18378

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5318