delta/gitlab/gitlab-ce.git/app/controllers, branch fix/serialized-commit-path gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'refactor-controller-params' into 'master' 2017-01-12T23:39:59+00:00 Robert Speicher robert@gitlab.com 2017-01-12T23:39:59+00:00 6d010ebfb934b782d558a5f93c69d3133f5e5635 Refactor controller params See merge request !8522 

Refactor controller params

See merge request !8522
 Merge branch '24185-legacy-ci-status-reactive-cache' into 'security' 2017-01-12T22:39:46+00:00 Robert Speicher robert@gitlab.com 2017-01-12T22:31:02+00:00 e75b1f11057829964dd9c3aac3b0a0deb964707e Use ReactiveCaching to update external CI status asynchronously See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2055 
Use ReactiveCaching to update external CI status asynchronously

See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2055
Refactor authorized params in GroupsController 2017-01-12T22:33:21+00:00 Rémy Coutable remy@rymai.me 2017-01-10T14:57:09+00:00 9e0d3906b931eb0f81c9cd9864891ca26cbefd44 Signed-off-by: Rémy Coutable <remy@rymai.me> 
Signed-off-by: Rémy Coutable <remy@rymai.me>
Refactor allowed params in ServiceParams 2017-01-12T22:33:21+00:00 Rémy Coutable remy@rymai.me 2017-01-10T14:41:31+00:00 6195ab754dcaac0930f01dae86d39adf9ac0fce9 Signed-off-by: Rémy Coutable <remy@rymai.me> 
Signed-off-by: Rémy Coutable <remy@rymai.me>
Add support for PlantUML diagrams in Asciidoc. 2017-01-12T10:04:52+00:00 Horacio Sanson horacio@allm.net 2016-11-28T17:41:29+00:00 f986b4c4e529f4c2518f0ce37dc9dfcaa2f073a0 This MR enables rendering of PlantUML diagrams in Asciidoc documents. To add a PlantUML diagram all we need is to include a plantuml block like: ``` [plantuml, id="myDiagram", width="100px", height="100px"] -- bob -> alice : ping alice -> bob : pong -- ``` The plantuml block is substituted by an HTML img element with *src* pointing to an external PlantUML server. This MR also add a PlantUML integration section to the Administrator -> Settings page to configure the PlantUML rendering service and to enable/disable it. Closes: #17603 
This MR enables rendering of PlantUML diagrams in Asciidoc documents. To add a
PlantUML diagram all we need is to include a plantuml block like:

```
[plantuml, id="myDiagram", width="100px", height="100px"]
--
bob -> alice : ping
alice -> bob : pong
--
```

The plantuml block is substituted by an HTML img element with *src* pointing to
an external PlantUML server.

This MR also add a PlantUML integration section to the Administrator -> Settings
page to configure the PlantUML rendering service and to enable/disable it.

Closes: #17603
Refactor authorized params in Admin::UsersController 2017-01-11T21:52:30+00:00 Rémy Coutable remy@rymai.me 2017-01-10T13:53:20+00:00 d8d9d0c74cdc0ec68bce23ba75706c1b78e864d1 Signed-off-by: Rémy Coutable <remy@rymai.me> 
Signed-off-by: Rémy Coutable <remy@rymai.me>
Refactor authorized params in Admin::GroupsController 2017-01-11T21:52:30+00:00 Rémy Coutable remy@rymai.me 2017-01-10T13:43:06+00:00 83c1395af2e457a1de919a67ff7a2b21dceaeeef Signed-off-by: Rémy Coutable <remy@rymai.me> 
Signed-off-by: Rémy Coutable <remy@rymai.me>
Refactor authorized params in Admin::ApplicationSettingsController 2017-01-11T21:52:30+00:00 Rémy Coutable remy@rymai.me 2017-01-10T13:40:08+00:00 dafd5531ed793321eb8d886715654b4d572b2880 Signed-off-by: Rémy Coutable <remy@rymai.me> 
Signed-off-by: Rémy Coutable <remy@rymai.me>
Merge branch 'master' into auto-pipelines-vue 2017-01-09T17:54:02+00:00 Regis boudinot.regis@yahoo.com 2017-01-09T17:54:02+00:00 6625f479f857aefde855f45d3e2c820bfbb872e3 






Merge branch '25985-combine-members-and-groups-settings-pages' into 'master'

2017-01-06T20:17:34+00:00

Alfredo Sumaran
alfredo@gitlab.com

2017-01-06T20:17:34+00:00

9cdfcbb50f225162fd46162e13e5b685819c9543


Moved the members and groups to single option called members

Closes #25985

See merge request !8281





Moved the members and groups to single option called members

Closes #25985

See merge request !8281