Commit graph

28 commits

Author SHA1 Message Date
Achilleas Pipinellis
a6985c77e0 Add new image to show the 'Reset template' button 2016-08-18 09:14:06 +03:00
Achilleas Pipinellis
163c4f5658 Refactor description templates documentation 2016-08-18 09:13:05 +03:00
Sean McGivern
e6f3461c0b Merge remote-tracking branch 'origin/master' into mc-ui 2016-08-17 16:55:28 +01:00
Achilleas Pipinellis
2257fda38e Reference the version 'UI resolve conflicts' was introduced
[ci skip]
2016-08-17 15:34:53 +03:00
Sean McGivern
b79378cae8 Add merge conflict docs 2016-08-12 23:24:49 +03:00
James Lopez
30f9596c61 Fix permissions check in controller, added relevant spec and updated docs 2016-08-11 16:59:37 +02:00
Mark Fletcher
2835688f89 Clarify the features for generating default label sets
* Split out the information regarding the label set that GitLab can generate
* Add information for the labels view in the Admin panel
2016-08-09 14:29:16 +01:00
Achilleas Pipinellis
689de9c6fb Simplify feature introduction note
[ci skip]
2016-08-08 11:44:55 +03:00
Achilleas Pipinellis
c3ed78a4ed Refactor build artifacts documentation
- 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
2016-08-04 13:06:26 +03:00
Achilleas Pipinellis
1a9431b914 Move markdown doc to the right location
[ci skip]
2016-08-03 08:54:17 +03:00
Achilleas Pipinellis
fc492c8905 Change Markdown document location 2016-08-02 13:42:14 +03:00
Achilleas Pipinellis
e5ba4e0f64 Merge branch 'doc_new_admin_area' into 'master'
Move admin application settings to own path

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

See merge request !5420
2016-07-22 09:26:02 +00:00
Achilleas Pipinellis
7a3b20ed36 Move admin application settings to own path
[ci skip]
2016-07-22 12:18:33 +03:00
Achilleas Pipinellis
1a5b7e7d70 Refactor protected branches documentation 2016-07-22 10:57:47 +03:00
Achilleas Pipinellis
461feb3ddf Add 'Accept merge request' to permissions table 2016-07-12 18:16:38 +03:00
Achilleas Pipinellis
c6735f9f20 Move permissions/permissions.md to user/permissions.md 2016-07-12 17:49:03 +03:00
http://jneen.net/
ffd8162191 doc: note that .gitattributes uses default branch 2016-06-27 14:17:49 -07:00
http://jneen.net/
f06fe77531 use the conf lexer so we have highlighted comments 2016-06-27 14:17:49 -07:00
http://jneen.net/
8c15989621 first draft of docs 2016-06-27 14:17:49 -07:00
Achilleas Pipinellis
6f6c6f68ea Merge branch 'doc_refactor_labels' into 'master'
Refactor labels docs

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

See merge request !3347
2016-06-22 12:18:47 +00:00
Achilleas Pipinellis
78186c68ff Refactor labels documentation
- Add new images to match the new UI
- Document the new prioritize feature
2016-06-22 13:50:02 +02:00
Achilleas Pipinellis
51b51de77d Give images proper names 2016-06-22 11:41:50 +02:00
Achilleas Pipinellis
a41b468816 Add note about the shared directory 2016-06-22 11:31:07 +02:00
Achilleas Pipinellis
10016715c1 Add colons in item lists 2016-06-22 11:15:28 +02:00
Achilleas Pipinellis
e023e66c9f Add note about enabling import/export in existing installations 2016-06-22 11:05:34 +02:00
Achilleas Pipinellis
b2732f3af1 Refactor project import/export documentation 2016-06-21 20:07:52 +02:00
Achilleas Pipinellis
0c61fad74c Move to new location
Due to https://gitlab.com/gitlab-org/gitlab-ce/issues/3349
2016-06-21 19:28:08 +02:00
Achilleas Pipinellis
8195deb8a6 Move labels documentation to new location
Due to https://gitlab.com/gitlab-org/gitlab-ce/issues/3349
2016-06-21 18:54:30 +02:00