delta/gitlab/gitlab-ce.git, branch fix-tmp-gitignore gitlab.com: gitlab-org/gitlab-ce.git Fix Git ignore for tmp/, shared/, and plugins/ 2019-09-03T15:03:53+00:00 Yorick Peterse yorick@yorickpeterse.com 2019-09-03T13:21:04+00:00 55063f854d52f4adec0d62e883bdd9cf8c2277f7 The old rules meant that any future changes to these directories would require the use of `git add -f` to be staged. This is problematic for the upcoming FOSS-only mirror of GitLab. Any changes to be synced to this mirror are staged using `git add --all .`, which due to the Git ignore rules would not add the tmp/ and shared/ directories. This then leads to various specs failing because they expect certain sub-directories of these directories to be available. This commit changes the rules so that we include the .gitkeep files, ignore other files, and completely ignore anything in tmp/test. This requires that the rules are specified in tmp/.gitignore and shared/.gitignore, instead of the top-level .gitignore, without this I could not get Git to include the .gitkeep files properly. 
The old rules meant that any future changes to these directories would
require the use of `git add -f` to be staged. This is problematic for
the upcoming FOSS-only mirror of GitLab. Any changes to be synced to
this mirror are staged using `git add --all .`, which due to the Git
ignore rules would not add the tmp/ and shared/ directories. This then
leads to various specs failing because they expect certain
sub-directories of these directories to be available.

This commit changes the rules so that we include the .gitkeep files,
ignore other files, and completely ignore anything in tmp/test. This
requires that the rules are specified in tmp/.gitignore and
shared/.gitignore, instead of the top-level .gitignore, without this I
could not get Git to include the .gitkeep files properly.
Merge branch 'ab-remove-support-bot-column' into 'master' 2019-09-03T11:58:03+00:00 Yorick Peterse yorick@yorickpeterse.com 2019-09-03T11:58:03+00:00 da0a5c7cc20194b71c41bd5572717fd9ac382cf4 Remove Users.support_bot column See merge request gitlab-org/gitlab-ce!32554 
Remove Users.support_bot column

See merge request gitlab-org/gitlab-ce!32554
 Merge branch 'clusterable_cluster_environments_path' into 'master' 2019-09-03T11:26:23+00:00 Jan Provaznik jprovaznik@gitlab.com 2019-09-03T11:26:23+00:00 aa34c693e9306445537fb6291520abceaab394c0 Add #environments_cluster_path which will always return nil in CE See merge request gitlab-org/gitlab-ce!32527 
Add #environments_cluster_path which will always return nil in CE

See merge request gitlab-org/gitlab-ce!32527
 Merge branch 'create-build-qa-image-for-all-pipelines' into 'master' 2019-09-03T11:18:33+00:00 Lin Jen-Shin godfat@godfat.org 2019-09-03T11:18:33+00:00 d548766cd46220c9fb7c76539a1b1e9463cb5dfe Make sure 'build-qa-image' is created for all pipelines See merge request gitlab-org/gitlab-ce!32570 
Make sure 'build-qa-image' is created for all pipelines

See merge request gitlab-org/gitlab-ce!32570
 Merge branch 'fix-cycle-analytics-seeds' into 'master' 2019-09-03T10:04:12+00:00 Thong Kuah tkuah@gitlab.com 2019-09-03T10:04:12+00:00 f15e3efba0e0523575ce61bd80396abda94b8cec Fix cycle analytics seed script See merge request gitlab-org/gitlab-ce!32536 
Fix cycle analytics seed script

See merge request gitlab-org/gitlab-ce!32536
 Fix cycle analytics seed script 2019-09-03T10:04:11+00:00 Adam Hegyi ahegyi@gitlab.com 2019-09-03T10:04:11+00:00 d4adad0c5e916f56717eaf9ed682fc542f3188dc 






Merge branch 'winh-quarantine-dashboard_spec' into 'master'
2019-09-03T10:03:09+00:00

Tim Zallmann
tzallmann@gitlab.com

2019-09-03T10:03:09+00:00

8c5d3fa63ed04fe6010a23ed0ffb8b07d0f091e3

Quarantine flaky dashboard_spec.js

See merge request gitlab-org/gitlab-ce!32574




Quarantine flaky dashboard_spec.js

See merge request gitlab-org/gitlab-ce!32574






Merge branch '62402-milestone-release-be' into 'master'
2019-09-03T09:39:00+00:00

Andreas Brandl
abrandl@gitlab.com

2019-09-03T09:39:00+00:00

e1f844994456607f7be96d587f0bfc2d2ee1fa72

"Allow milestones to be associated with releases" BE

See merge request gitlab-org/gitlab-ce!30816




"Allow milestones to be associated with releases" BE

See merge request gitlab-org/gitlab-ce!30816






Added relationships between Release and Milestone
2019-09-03T09:38:59+00:00

Etienne Baqué
ebaque@gitlab.com

2019-09-03T09:38:59+00:00

a43ab8d6a430014e875deb3bff3fd8d8da256747

Modified schema via migrations.
Added one-to-one relationship between the two models.
Added changelog file





Modified schema via migrations.
Added one-to-one relationship between the two models.
Added changelog file







Merge branch 'db/prometheus-metrics-not-null-constraints' into 'master'
2019-09-03T09:37:12+00:00

Andreas Brandl
abrandl@gitlab.com

2019-09-03T09:37:12+00:00

de4e2dcafceee485cba9ef6993062b00a4929d2f

Add not null constraints to prometheus_metrics table columns

Closes #66663

See merge request gitlab-org/gitlab-ce!32339




Add not null constraints to prometheus_metrics table columns

Closes #66663

See merge request gitlab-org/gitlab-ce!32339