delta/gitlab/gitlab-ce.git/lib/api/settings.rb, branch dz-patch-1

Merge branch 'master' into 'jej-pages-to-ce'

2017-02-06T15:12:27+00:00

# Conflicts:
#   db/schema.rb

Introduce maximum session time for terminal websocket connection

2017-02-06T10:49:30+00:00

Store the value in application settings.
Expose the value to Workhorse.

Ported max_pages_size in settings API to CE

2017-02-02T22:21:06+00:00

Add support for PlantUML diagrams in Asciidoc.

2017-01-12T10:04:52+00:00

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

Grapify the settings API

2016-12-29T10:24:15+00:00

Allow multiple repository storage shards to be enabled, and automatically round-robin between them

2016-11-04T04:01:08+00:00

Add tests and improve logic

2015-07-06T14:47:19+00:00

Signed-off-by: Dmitriy Zaporozhets

Add docs and empty specs for applicaiton settings API

2015-07-06T13:53:08+00:00

Signed-off-by: Dmitriy Zaporozhets

API to set application settings for admin

2015-07-03T14:50:21+00:00

Signed-off-by: Dmitriy Zaporozhets