delta/gitlab/gitlab-ce.git/doc/user, branch fix/update-gitlab-git

Merge remote-tracking branch 'origin/master' into mc-ui

2016-08-17T15:55:28+00:00

Reference the version 'UI resolve conflicts' was introduced

2016-08-17T12:34:53+00:00

[ci skip]

Add merge conflict docs

2016-08-12T20:24:49+00:00

Fix permissions check in controller, added relevant spec and updated docs

2016-08-11T14:59:37+00:00

Clarify the features for generating default label sets

2016-08-09T13:29:16+00:00

* Split out the information regarding the label set that GitLab can generate
* Add information for the labels view in the Admin panel

Simplify feature introduction note

2016-08-08T08:44:55+00:00

[ci skip]

Refactor build artifacts documentation

2016-08-04T10:06:26+00:00

- Split user and admin documentation
- Use new location paths
- Add new Continuous Integration guide for the Admin area
- Link to new guide from the Admin area

Move markdown doc to the right location

2016-08-03T05:54:17+00:00

[ci skip]

Change Markdown document location

2016-08-02T10:42:14+00:00

Merge branch 'doc_new_admin_area' into 'master'

2016-07-22T09:26:02+00:00


Move admin application settings to own path

Move existing documentation to its own `user/admin_area/settings` path.

See merge request !5420