https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12594802

* upstream/master:
  Add notification_settings:events to schema
  Fixed mobile styling
  Set path for pinned nav cookie
  Fixed placement of close button on merge requests
  using request dot path instead
  Turn note into normal text
  Document environments and deployments
  Tweak grammar
  fix double query string in url
  Broken instructions. git fetch --all --tags doesn't refresh tags

Broken instructions. git fetch --all --tags doesn't refresh tags



See merge request !4092

Add notification_settings:events to schema

See merge request !4800

Fixed placement of close button on merge requests

## What does this MR do?

Fixes the order in which the MR buttons appear

## Screenshots (if relevant)

![Screen_Shot_2016-06-18_at_21.41.38](/uploads/66a88ebc287b7c21160af193ee9de54c/Screen_Shot_2016-06-18_at_21.41.38.png)

![Screen_Shot_2016-06-18_at_21.41.44](/uploads/ba8f6776d79f4eb0af7877c3c71fbb54/Screen_Shot_2016-06-18_at_21.41.44.png)


See merge request !4778

Fix double query string in url

This MR should fix the double query string in url  that shows up while using the "filter by name .."  input  on projects list pages and also closes [17743](https://gitlab.com/gitlab-org/gitlab-ce/issues/17743)

Closes #17743

See merge request !4480

Set path for pinned nav cookie

## What does this MR do?

Sets a path for the pinned nav cookie so it will be present across page reload.

Closes #18836 

See merge request !4784

Document environments and deployments

## What does this MR do?

Adds an introduction to environments and deployments and tweaks the `environments` entry in `.gitlab-ci.yml` documentation.

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

## Why was this MR needed?

## What are the relevant issue numbers?

Closes #18683.

## Screenshots (if relevant)

![image](/uploads/1e3355c543abaf7b358f3c37596b1f0b/image.png)

![image](/uploads/58a51505674bcf605039db46833a8ae6/image.png)

/cc @ayufan @axil 

See merge request !4725

* upstream/master: (353 commits)
  Put some admin settings in dropdown
  Add styleguide on configuration settings documentation
  Remove Duplicated keys add UNIQUE index to fingerprint
  Avoid autoload issue such as 'Mail::Parsers::AddressStruct'
  Move appearance settings as sub tab to application settings
  use rails root join
  fixed a couple of errors spotted in production
  Fix RangeError exceptions when referring to issues or merge requests outside of max database values
  Fix bug in `WikiLinkFilter`.
  Grammar and typographic changes to artifacts documentation
  Tweak grammar
  Small frontend code fixes and restore 8a2d88f commit
  Warn about admin privilege to disable GitHub Webhooks
  Listing GH Webhooks doesn't stop import process for non GH admin users
  fixup! updated docs for api endpoint award emoji
  Update CHANGELOG
  Ensure Todos counters doesn't count Todos for projects pending delete
  Add endpoints for award emoji on notes
  Sort API endpoints and implement feedback
  Add endpoints for Award Emoji
  ...

Remove Duplicated keys adding UNIQUE index to fingerprint

See merge request !4787

Avoid autoload issue such as 'Mail::Parsers::AddressStruct'

This is mostly a shot in the dark but at least it shouldn't break anything.

Fixes #18810.

See merge request !4793

Limit push email diff size

Restrict the size of diffs in push emails to 30 lines / 150 KB (whichever is smaller),
following https://gitlab.com/gitlab-org/gitlab_git/merge_requests/85.

Emails on push can get very large if they contain a lot of files that sneak under the single-file limit.

https://gitlab.com/gitlab-org/gitlab-ee/issues/490

See merge request !4566

Move part of admin area navigation from tabs into settings dropdown

Partly fix https://gitlab.com/gitlab-org/gitlab-ce/issues/18799 

See merge request !4796

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12571602
and
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12571670

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Grammar tweaks

## What does this MR do?

* Updates grammar in recent CI documentation.

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

## Why was this MR needed?

Because grammar.

## What are the relevant issue numbers?

Needed because of !4200 and !4201.

## Screenshots (if relevant)


See merge request !4772

Add documentation styleguide  on configuration settings

See merge request !4794

[ci skip]

By eager-loading the Mail gem in the Sidekiq initializer.
Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12563922

For clarification and consistency

Fixed a couple of errors on import/export spotted in production

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18828 and https://gitlab.com/gitlab-org/gitlab-ce/issues/18829

A couple of tiny bugs spotted after deploying in prod

See merge request !4782

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12533926

Fix RangeError exceptions when referring to issues or merge requests outside of max database values

When using #XYZ in Markdown text, if XYZ exceeds the maximum value of a signed 32-bit integer, we get an exception when the Markdown render attempts to run `where(iids: XYZ)`. Introduce a method that will throw out out-of-bounds values.
    
Closes #18777

See merge request !4777

When using #XYZ in Markdown text, if XYZ exceeds the maximum value of a signed 32-bit integer, we
get an exception when the Markdown render attempts to run `where(iids: XYZ)`. Introduce a method
that will throw out out-of-bounds values.

Closes #18777

Display Star and Fork on mobile, fix #18537.

## What does this MR do?

Displays the Star and Fork buttons on mobile devices.

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

Nope.

## Why was this MR needed?

I wanted to star and/or fork projects while on my phone, I couldn't do that before.

## What are the relevant issue numbers?

#18537 

## Screenshots (if relevant)

![Screen_Shot_2016-06-16_at_11.41.24_AM](/uploads/053ac0c1b39a7b1b30fffb0a8d43cffb/Screen_Shot_2016-06-16_at_11.41.24_AM.png)

cc: @jschatz1 

See merge request !4714

Add merge request data to the progress information on Milestones pages.

## What does this MR do?

Adds data about merge requests to the Milestone show view. It previously only showed something like `3 issues: 2 open and 1 closed 20% complete`, now it shows `3 issues: 2 open and 1 closed 2 merge requests: 2 open and 0 merged 20% complete`.

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

I don't think so.

## Why was this MR needed?

The milestone progress % didn't accurately reflect the open/merged MRs.

## What are the relevant issue numbers?

Fixes #13980

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-06-16_at_2.12.57_PM](/uploads/99a044ea918b23fe93cef3305c21086e/Screen_Shot_2016-06-16_at_2.12.57_PM.png)

After:

![Screen_Shot_2016-06-16_at_2.12.38_PM](/uploads/be17e723b9c9bbe33099d1f0e94192d0/Screen_Shot_2016-06-16_at_2.12.38_PM.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [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)

cc: @jschatz1

See merge request !4719

Fix margin & padding on activity btn

## What does this MR do?
Fixes alignment of activity btn

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

## Screenshots (if relevant)
![Screen_Shot_2016-06-17_at_9.29.06_AM](/uploads/4ab9fb33d450dda72811a5ce2570b8c7/Screen_Shot_2016-06-17_at_9.29.06_AM.png)


See merge request !4750

Fixed alignment of buttons in note forms

## What does this MR do?

Due to a CSS change on some buttons, the alignment of the save button on the note form went off. Also, it made no sense to have `.btn-grouped` as the button wasn't in a group.

## Screenshots (if relevant)

![Screen_Shot_2016-06-17_at_11.43.33](/uploads/5d9037a48ff6179fc906bdf0c6d5ff47/Screen_Shot_2016-06-17_at_11.43.33.png)

![Screen_Shot_2016-06-17_at_11.43.43](/uploads/8b130a25e8f73e79578d38f5f7aff4fb/Screen_Shot_2016-06-17_at_11.43.43.png)


See merge request !4740

Move admin->runners tab as subnav of overview tab

cc @annabeldunstone 

See merge request !4716

Fixed tooltip placement on edit tags button

## What does this MR do?

Moves the placement of the tooltip to the body so not to affect the movement of the button.

## Screenshots (if relevant)

Old:

![tooltip-old](/uploads/9ecb9bb919578881994698cd8b1d1826/tooltip-old.gif)

New:

![tooltip-new](/uploads/66f90cf95c2ee4001bfa3c65b9de8c05/tooltip-new.gif)


See merge request !4737

Fixed size of buttons in branches list

## What does this MR do?

The buttons on the branch list were using `btn-xs` this MR removes that so the buttons are a normal size to match https://gitlab.com/gitlab-org/gitlab-ce/tags

## What are the relevant issue numbers?

#18677 

## Screenshots (if relevant)

![Screen_Shot_2016-06-17_at_10.38.31](/uploads/19fc173e3f549a84bb14517613403792/Screen_Shot_2016-06-17_at_10.38.31.png)

See merge request !4735

Aligns create merge request button vertically

## What does this MR do?

Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4644#note_12507178 I have vertically aligned the button correctly.

## Screenshots (if relevant)

Here is my awesome screenshot to show it is centered vertically 

![Screen_Shot_2016-06-17_at_10.17.19](/uploads/e7bf5bcc5b254ed4db376c16460d79a5/Screen_Shot_2016-06-17_at_10.17.19.png)

See merge request !4733