delta/gitlab/gitlab-ce.git, branch input-button-hover gitlab.com: gitlab-org/gitlab-ce.git Add hover state to MR comment reply button 2017-01-12T16:40:04+00:00 Annabel Dunstone Gray annabel.dunstone@gmail.com 2017-01-12T16:27:22+00:00 cb316804aa59986c2a31bd8bcbc056e7fc0e66c0 






Merge branch 'search-bar-first-iteration' into 'master'

2017-01-12T14:57:57+00:00

Jacob Schatz
jschatz@gitlab.com

2017-01-12T14:57:57+00:00

3c9a3918e6a93a3e3cdcbe63214809d2ba9eb959


Search bar first iteration

Closes #21747

See merge request !7345





Search bar first iteration

Closes #21747

See merge request !7345






Merge branch 'Sanson/gitlab-ce-asciidoctor-plantuml' into 'master'

2017-01-12T11:18:42+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-01-12T11:18:42+00:00

50fff719fc148ac9f6f6a309770c6136a3aeb31b


Add support for PlantUML diagrams in Asciidoc.

Closes #17603

See merge request !8537





Add support for PlantUML diagrams in Asciidoc.

Closes #17603

See merge request !8537






Merge branch 'do-not-remove-autodeploy-directory-when-fetching-ci-templates' into 'master'

2017-01-12T10:30:03+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-01-12T10:30:03+00:00

e798ee718312dbe7445ec9cf2e75045e8b2b3117


Do not remove "autodeploy" directory when fetching CI templates

See merge request !8517





Do not remove "autodeploy" directory when fetching CI templates

See merge request !8517






Merge branch 'fix/project-delete-tooltip' into 'master'

2017-01-12T10:22:30+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-01-12T10:22:30+00:00

e4cde4281c45ceef49f89370724453a0bb6f15cc


Fix project queued for deletion re-creation tooltip

Closes #17235

See merge request !5393





Fix project queued for deletion re-creation tooltip

Closes #17235

See merge request !5393






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







Fix rubocop
2017-01-12T02:12:03+00:00

Clement Ho
ClemMakesApps@gmail.com

2017-01-12T02:12:03+00:00

3e457f78cf6798042a1fc30790c24f935861182f












Merge branch 'refactor-admin-controllers-params' into 'master'

2017-01-12T02:00:04+00:00

Robert Speicher
robert@gitlab.com

2017-01-12T02:00:04+00:00

826adaaff876d2b6b5886e6d8133b0d0c2cd4a2d


Refactor admin controllers params

See merge request !8521





Refactor admin controllers params

See merge request !8521






Backend review
2017-01-12T01:47:42+00:00

Clement Ho
ClemMakesApps@gmail.com

2017-01-12T01:47:42+00:00

ce9d3ee599f816ba20d57eae16b4139cabecdb1a












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>