delta/gitlab/gitlab-ce.git, branch docs-topic-permissions gitlab.com: gitlab-org/gitlab-ce.git fix conflict 2017-08-15T14:20:11+00:00 Marcia Ramos virtua.creative@gmail.com 2017-08-15T14:20:11+00:00 35c9a75eff464ff7bb0e58c67488a6fa1bdebaaa 






Axil's review
2017-08-15T14:15:38+00:00

Marcia Ramos
virtua.creative@gmail.com

2017-08-15T14:15:38+00:00

0112d13314e1aea350c7dacc02c0f1c527566809












Merge branch '36450_confi_polish' into 'master'
2017-08-15T13:50:07+00:00

Clement Ho
clemmakesapps@gmail.com

2017-08-15T13:50:07+00:00

fe09c25d68a61c5874e9beb0f018c05a4d789d70

Change Confidential Message When Visible - UI Polish

See merge request !13551




Change Confidential Message When Visible - UI Polish

See merge request !13551






Merge branch 'zj-add-two-more-project-templates' into 'master'
2017-08-15T12:44:51+00:00

Douwe Maan
douwe@gitlab.com

2017-08-15T12:44:51+00:00

f2cae26836570a1feadc488aa086215c53024e0d

Add two more project templates

See merge request !13415




Add two more project templates

See merge request !13415






Add two more project templates
2017-08-15T10:55:54+00:00

Z.J. van de Weg
git@zjvandeweg.nl

2017-08-09T10:16:43+00:00

639140677410f11955947980aa47356e1136c32e

Related to !13108. Mostly this is just running the rake task and
changing the task a bit to catch cases like the project already existing
or so. The rake task moves archives to the vendor/project_template
directory, which are checked in too.





Related to !13108. Mostly this is just running the rake task and
changing the task a bit to catch cases like the project already existing
or so. The rake task moves archives to the vendor/project_template
directory, which are checked in too.







Merge branch 'docs-jira' into 'master'
2017-08-15T09:01:51+00:00

Douwe Maan
douwe@gitlab.com

2017-08-15T09:01:51+00:00

4a2a6d521a260981482ee8e4931ebf06cb4f5b6a

JIRA docs update

See merge request !13514




JIRA docs update

See merge request !13514






Merge branch 'malformed-submodule' into 'master'
2017-08-15T09:00:44+00:00

Douwe Maan
douwe@gitlab.com

2017-08-15T09:00:44+00:00

0da644072fa2a79bcb52883eb67838bc02dfc412

Handle missing .gitmodules when getting submodule urls

See merge request !13509




Handle missing .gitmodules when getting submodule urls

See merge request !13509






Merge branch 'winh-gpg-status-spinners' into 'master'
2017-08-15T08:20:35+00:00

Phil Hughes
me@iamphill.com

2017-08-15T08:20:35+00:00

ae06b5dbc6afbd17dee8880928669bb4159964db

Display GPG status loading spinner only when Ajax request is made

Closes #35699

See merge request !13526




Display GPG status loading spinner only when Ajax request is made

Closes #35699

See merge request !13526






Display GPG status loading spinner only when Ajax request is made
2017-08-15T08:20:35+00:00

Winnie Hellmann
winnie@gitlab.com

2017-08-15T08:20:35+00:00

d2b4109b0830970f41c60b7407366bf760d41676












Merge branch 'fix-broadcast-messages-migration' into 'master'
2017-08-15T08:13:37+00:00

Douwe Maan
douwe@gitlab.com

2017-08-15T08:13:37+00:00

155de419029a200a04e257baded9ea3c5f5bfe99

Remove invalid broadcast messages before migrating

See merge request !13538




Remove invalid broadcast messages before migrating

See merge request !13538