delta/gitlab/gitlab-ce.git/spec/lib, branch fix/serialized-commit-path gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'zj-unadressable-url-variables' into 'master' 2017-01-12T18:19:11+00:00 Douwe Maan douwe@gitlab.com 2017-01-12T18:19:11+00:00 764fc0dd69b3e064d4b14ce8125fbb6daa98cf7f Do not check for valid url for .gitlab-ci.yml Closes #22970 See merge request !8451 

Do not check for valid url for .gitlab-ci.yml

Closes #22970

See merge request !8451
 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 offenses in LDAP related code and spec 2017-01-10T13:31:21+00:00 Grzegorz Bizon grzesiek.bizon@gmail.com 2017-01-10T13:31:21+00:00 cff423449f0015d92fa8a06f034eaa2b0ad9af9f 






Merge branch 'restore-backup-when-env-variable-is-passed' into 'master'

2017-01-10T11:09:06+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-01-10T11:09:06+00:00

e93cd61793020128ae2f577b20d8e4cc2313ce8b


Restore backup correctly when "BACKUP" environment variable is passed

Closes #26090

See merge request !8477





Restore backup correctly when "BACKUP" environment variable is passed

Closes #26090

See merge request !8477






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












Restore backup correctly when "BACKUP" environment variable is passed
2017-01-09T17:38:53+00:00

Adam Niedzielski
adamsunday@gmail.com

2017-01-09T17:38:53+00:00

82692ea2140fc35cca4157050c29abffbc5d71b0












Merge branch '19086-double-newline' into 'master'

2017-01-09T15:50:05+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-01-09T15:50:05+00:00

6c62482144e786f83ed62298e06604e46e93107e


Fix Double Spaced CI Log

Closes #19086

See merge request !8349





Fix Double Spaced CI Log

Closes #19086

See merge request !8349






Merge branch 'feature/log-ldap-to-application-log' into 'master'

2017-01-09T13:39:19+00:00

Rémy Coutable
remy@rymai.me

2017-01-09T13:39:19+00:00

60569032658e93658f789f8bd8bbaef56ea39412


Log LDAP blocking/unblocking events to application log

See merge request !8042





Log LDAP blocking/unblocking events to application log

See merge request !8042






Merge branch 'track_last_used_date_of_ssh_keys' into 'master'

2017-01-09T10:30:49+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-01-09T10:30:49+00:00

cb4964d23b49f775ad3c8aa562942911b6b1c262


Record and show last used date of SSH Keys

See merge request !8113





Record and show last used date of SSH Keys

See merge request !8113






Record and show last used date of SSH Keys
2017-01-08T17:15:39+00:00

Vincent Wong
wingyu64@gmail.com

2016-12-21T14:59:54+00:00

b6df93a51f90c7ed29ce6667c6b1a8debf02506e

Addresses: Issue #13810

1. Adds a last_used_at attribute to the Key table/model
2. Update a key's last_used_at whenever it gets used
3. Display how long ago an ssh key was last used





Addresses: Issue #13810

1. Adds a last_used_at attribute to the Key table/model
2. Update a key's last_used_at whenever it gets used
3. Display how long ago an ssh key was last used