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

Conflicts:
	app/helpers/tab_helper.rb
	app/models/merge_request.rb
	app/views/layouts/nav/_project_settings.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	doc/api/groups.md

Add a note that changing example configuration files requires changing omnibus-gitlab.

Keeping track of changes in these files is not easy and they usually require change in omnibus-gitlab.

Added a note so everyone is aware of this.

Similar is added to gitlab-shell and gitlab-ci.

Discussed in gitlab-org/omnibus-gitlab#605

See merge request !800

Refactor accept merge request widget

* make each case a simple view
* separate  merge request JS from merge request accept widget JS
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !799

Fix graph width on different screen sizes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !802

Make commit calendar size depend on window size
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !801

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

Add negative tabindex to Markdown Write and Preview tabs

Closes #1757

See merge request !796

An `in_namespace` scope is already present

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

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

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

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

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

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

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

[Docker][Documentation] Uses correct docker image from Docker Hub

[Docker][Documentation] Uses new docker data image from Docker Hub (*sytse/gitlab-data*). Uniform tag name for data image is now *gitlab-data*.

Info about namespaces

Added info about namespaces in groups.

Because of tweet https://twitter.com/kaystrobach/status/603912904757420032

See merge request !1835

Update grids for 2FA details

Also adds a link to the documentation.

Closes #1758

See merge request !795

Documentation for approves feature

See merge request !418

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

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

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

fix and minify images

See merge request !1853

move and fix links importing docs

See merge request !1852

Update oauth button logos for Twitter and Google

Both new buttons are 64x64 renders of the recommended assets
from each company.

Refs for those recommendations are:

 - https://about.twitter.com/press/twitter-brand-policy
 - https://developers.google.com/identity/branding-guidelines

Closes issue #544

[ci skip]

Sign in UI before:

![sign-in-buttons-before](https://gitlab.com/fmborghino/gitlab-ce/uploads/ed42a056b23eb6db3907cb604a865ce5/sign-in-buttons-before.png)

Sign in UI after:

![sign-in-buttons-after](https://gitlab.com/fmborghino/gitlab-ce/uploads/c7fb1d996fa744274298e195799bc033/sign-in-buttons-after.png)

See merge request !798

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

Both new buttons are 64x64 renders of the recommended assets
from each company.

Refs for those are:

 - https://about.twitter.com/press/twitter-brand-policy
 - https://developers.google.com/identity/branding-guidelines

Addresses issue #544

Fix alignment of Project Settings nav icons.

@douwe thanks for reviewing this small fix.

![before_after](https://dev.gitlab.org/gitlab/gitlabhq/uploads/ce213aa5b08c640ec5e9b018e0ec4036/before_after.png)

See merge request !1848

[ci skip]

Closes #1757

Also adds a link to the documentation.