delta/gitlab/gitlab-ce.git/spec/support, branch fix-diff-comment-alignment gitlab.com: gitlab-org/gitlab-ce.git Merge branch '45487-slack-tag-push-notifs' into 'master' 2018-06-19T12:07:05+00:00 Sean McGivern sean@mcgivern.me.uk 2018-06-19T12:07:05+00:00 d04ac74556e74df89da8f46ed4188b0376b71c3d Resolve "Slack Tag push notifications are not send (only default branch option)" Closes #45487 See merge request gitlab-org/gitlab-ce!19864 
Resolve "Slack Tag push notifications are not send (only default branch option)"

Closes #45487

See merge request gitlab-org/gitlab-ce!19864
 Merge branch '48093-fix-flakey-notes-background-process-specs' into 'master' 2018-06-19T09:13:38+00:00 Rémy Coutable remy@rymai.me 2018-06-19T09:13:38+00:00 0fcb6d3347d2976820c27254762d4d70f6836413 Fix flakey time-sensitive notes creation specs that rely on background Sidekiq jobs Closes #48093 See merge request gitlab-org/gitlab-ce!19979 
Fix flakey time-sensitive notes creation specs that rely on background Sidekiq jobs

Closes #48093

See merge request gitlab-org/gitlab-ce!19979
 Fix flakey time-sensitive specs that rely on notes background Sidekiq jobs 2018-06-19T00:00:25+00:00 Eric Eastwood contact@ericeastwood.com 2018-06-19T00:00:25+00:00 c46ff7de67d31bfc8875abf58d0fd096b6d725ae Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/48093 We use `perform_enqueued_jobs` because it is "adapter-agnostic so it's better to use it over Sidekiq::Testing.inline!." -- https://gitlab.com/gitlab-org/gitlab-ce/issues/22991 
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/48093

We use `perform_enqueued_jobs` because it is "adapter-agnostic so it's better to use it over Sidekiq::Testing.inline!." -- https://gitlab.com/gitlab-org/gitlab-ce/issues/22991
Allow querying a single MR within a project 2018-06-15T12:38:32+00:00 Bob Van Landuyt bob@vanlanduyt.co 2018-06-14T13:06:53+00:00 9403b1d951c47aca67d2bac1369b86c125c5119d This allows the user to get a single MR nested in a GraphQL project query. Since we need the full path and the iid anyway, this makes more sense than having a root query that needs the full path as well. 
This allows the user to get a single MR nested in a GraphQL project
query.

Since we need the full path and the iid anyway, this makes more sense
than having a root query that needs the full path as well.
ChatNotificationService - fix sending tag notifications when "only default branch" enabled 2018-06-14T17:57:15+00:00 Mario de la Ossa mariodelaossa@gmail.com 2018-06-14T17:40:35+00:00 2fec4183368aebf848e3014598081948ddce49ca 






Merge branch 'rails5-database' into 'master'
2018-06-14T13:12:37+00:00

Sean McGivern
sean@mcgivern.me.uk

2018-06-14T13:12:37+00:00

17335a42aea4c9ddccbe92527752ae0e6b9b7835

Fix table_exists? to be Rails5 compatible

Closes #45107

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




Fix table_exists? to be Rails5 compatible

Closes #45107

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






Deny repository disk access in development and test
2018-06-14T11:18:25+00:00

Jacob Vosmaer (GitLab)
jacob@gitlab.com

2018-06-14T11:18:25+00:00

5cf5680f9c8ce251570efce7dd4c348fb68efccf












Merge branch 'jprovazn-rails5-shoulda' into 'master'
2018-06-14T09:01:36+00:00

Rémy Coutable
remy@rymai.me

2018-06-14T09:01:36+00:00

ed366cc23a099a567bdaf412acb0258bd1dda68a

Fix shoulda-matchers in Rails 5

Closes #47639

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




Fix shoulda-matchers in Rails 5

Closes #47639

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






Use data_source_exists? instead of table_exists?
2018-06-14T06:39:43+00:00

Jarka Kadlecová
jarka@gitlab.com

2018-06-05T09:29:33+00:00

fa36101a7fc8679d98198942f15dd6285673594d

Use data_source_exists? where possible instead of table_exists? in order to be Rails5 compatible





Use data_source_exists? where possible instead of table_exists? in order to be Rails5 compatible







Fix shoulda-matchers in Rails 5
2018-06-13T11:21:12+00:00

Jan Provaznik
jprovaznik@gitlab.com

2018-06-13T11:21:12+00:00

6d902e07d908769a909db0bf93d84f5be28720af

Backports a fix for https://github.com/thoughtbot/shoulda-matchers/issues/913.
This can be removed once new shoulda-matchers version is released.





Backports a fix for https://github.com/thoughtbot/shoulda-matchers/issues/913.
This can be removed once new shoulda-matchers version is released.