delta/gitlab/gitlab-ce.git/db, branch patch-10 gitlab.com: gitlab-org/gitlab-ce.git Revert MattermostNotificationService and SlackNotificationService to MattermostService and SlackService 2016-12-28T14:48:19+00:00 Felipe Artur felipefac@gmail.com 2016-12-21T19:41:46+00:00 56465687511e19f5b7d7fe91f2bb4e2ae51de390 






Merge branch 'master' into 'dz-rename-reserved-project-names'
2016-12-27T16:34:20+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2016-12-27T16:34:20+00:00

6024697c100e003ec456b9ad2e9461d73250dbb8

# Conflicts:
#   db/schema.rb




# Conflicts:
#   db/schema.rb






Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master'

2016-12-27T15:00:49+00:00

Douwe Maan
douwe@gitlab.com

2016-12-27T15:00:49+00:00

20afb4c69ee91a91094eed2bffd566c5bca1ce0d


Allow to add deploy keys with write-access

Closes #1376

See merge request !7383





Allow to add deploy keys with write-access

Closes #1376

See merge request !7383






Merge branch 'dz-rename-invalid-users' into 'master'

2016-12-27T14:53:16+00:00

Douwe Maan
douwe@gitlab.com

2016-12-27T14:53:16+00:00

cdb29c2fb00a873e8f8f646b06c7b000cc13e610


Rename users with namespace ending with .git

See merge request !8309





Rename users with namespace ending with .git

See merge request !8309






Disable timeout while removing services
2016-12-27T10:10:15+00:00

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

2016-12-27T10:10:13+00:00

269bc745063319cf0004de445c540af8d8c61ce5

On GitLab.com this migration could take about 3 minutes. Disabling the
statement we know we have enough time to complete this.

Fixes #25976





On GitLab.com this migration could take about 3 minutes. Disabling the
statement we know we have enough time to complete this.

Fixes #25976







Rename users with namespace ending with .git
2016-12-26T14:14:41+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2016-12-26T14:14:41+00:00

dbfac0de066c4770a15d4e9a96dbc01edf9add3f

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







Merge branch 'feature/more-storage-statistics' into 'master'

2016-12-26T09:48:30+00:00

Sean McGivern
sean@mcgivern.me.uk

2016-12-26T09:48:30+00:00

0ebd50ce0015a6a1dcd273cada9d9be8c20a12bb


Add more storage statistics

See merge request !7754





Add more storage statistics

See merge request !7754






Removed return from reserved project migration
2016-12-24T17:39:51+00:00

Yorick Peterse
yorickpeterse@gmail.com

2016-12-23T15:25:35+00:00

2f93259c6b3a1c543a6ea089f8e84257c7ab6ba5

This return is redundant as the query now uses "WHERE EXISTS (...)" to
filter out projects without a namespace.





This return is redundant as the query now uses "WHERE EXISTS (...)" to
filter out projects without a namespace.







Fix parallel renaming of reserved projects
2016-12-24T17:39:51+00:00

Yorick Peterse
yorickpeterse@gmail.com

2016-12-23T15:18:36+00:00

dcea45015c4b8f9ea36fac02a2ff9817f0c01339

This ensures threads don't re-use the same connection object, and use
fewer queries to perform the work.





This ensures threads don't re-use the same connection object, and use
fewer queries to perform the work.







Rename projects with reserved path names
2016-12-24T17:39:51+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2016-12-21T17:31:30+00:00

d72b40423c6736fd24ef4371604897871a1b3acc

We cant have project with name 'project' or 'tree' anymore.
This merge request containts a migration that will find and rename all
projects using reserved names by adding N digit to the end of the name.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





We cant have project with name 'project' or 'tree' anymore.
This merge request containts a migration that will find and rename all
projects using reserved names by adding N digit to the end of the name.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>