delta/gitlab/gitlab-ce.git/app/controllers/admin, branch terminal-max-session-time gitlab.com: gitlab-org/gitlab-ce.git Introduce maximum session time for terminal websocket connection 2017-02-06T10:49:30+00:00 Adam Niedzielski adamsunday@gmail.com 2017-01-26T18:16:50+00:00 5d3816652e13cde6bf5e9de814d2c9d1e6593601 Store the value in application settings. Expose the value to Workhorse. 
Store the value in application settings.
Expose the value to Workhorse.
replace `find_with_namespace` with `find_by_full_path` 2017-02-03T00:14:04+00:00 Adam Pahlevi adam.pahlevi@gmail.com 2017-02-02T23:43:19+00:00 a0586dbc165cc09422412149712a218938137308 add complete changelog for !8949 
add complete changelog for !8949
EE backport for new application settings service 2017-01-23T18:22:33+00:00 Oswaldo Ferreira oswaldo@gitlab.com 2017-01-20T15:00:19+00:00 ae057666bf9894660ce1cb480595f2686f1d9ae5 






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>







Merged the 'groups' and 'projects' tabs when viewing user profiles
2016-12-29T22:42:16+00:00

James Gregory
james.gregory@epigenesys.org.uk

2016-12-28T22:22:57+00:00

b21024684b7c8f9fdef524873434e057de7a2713












Fix: Admin group show page does not work
2016-12-28T13:34:12+00:00

Valery Sizov
valery@gitlab.com

2016-12-28T11:10:34+00:00

684536321c9c847a8a39d0adc95e0c17be355c72












Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master'

2016-12-27T15:00:49+00:00

Douwe Maan
douwe@gitlab.com

2016-12-27T15:00:49+00:00

20afb4c69ee91a91094eed2bffd566c5bca1ce0d


Allow to add deploy keys with write-access

Closes #1376

See merge request !7383





Allow to add deploy keys with write-access

Closes #1376

See merge request !7383