delta/gitlab/gitlab-ce.git/app/controllers/admin, branch diff-notes-refactor

Merge branch 'ee-1439-read-only-user' into 'master'

2017-02-07T04:10:13+00:00


Backport changes from gitlab-org/gitlab-ee!998

See merge request !8984

Backport of the frontend view, including tests

2017-02-06T22:17:46+00:00

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.

Merge branch 'master' into jej-pages-picked-from-ee

2017-02-03T17:25:26+00:00

replace `find_with_namespace` with `find_by_full_path`

2017-02-03T00:14:04+00:00

add complete changelog for !8949

Add GitLab Pages

2017-01-31T22:50:39+00:00

- The pages are created when build artifacts for `pages` job are uploaded
- Pages serve the content under: http://group.pages.domain.com/project
- Pages can be used to serve the group page, special project named as host: group.pages.domain.com
- User can provide own 403 and 404 error pages by creating 403.html and 404.html in group page project
- Pages can be explicitly removed from the project by clicking Remove Pages in Project Settings
- The size of pages is limited by Application Setting: max pages size, which limits the maximum size of unpacked archive (default: 100MB)
- The public/ is extracted from artifacts and content is served as static pages
- Pages asynchronous worker use `dd` to limit the unpacked tar size
- Pages needs to be explicitly enabled and domain needs to be specified in gitlab.yml
- Pages are part of backups
- Pages notify the deployment status using Commit Status API
- Pages use a new sidekiq queue: pages
- Pages use a separate nginx config which needs to be explicitly added

EE backport for new application settings service

2017-01-23T18:22:33+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

Refactor authorized params in Admin::UsersController

2017-01-11T21:52:30+00:00

Signed-off-by: Rémy Coutable