delta/gitlab/gitlab-ce.git/lib/api, branch server-flash-click-remove gitlab.com: gitlab-org/gitlab-ce.git Move all API authentication code to APIGuard 2017-10-12T09:13:37+00:00 Douwe Maan douwe@selenight.nl 2017-09-27T13:56:48+00:00 025c6eeaa1e02dce31cb836c39ee4a5f312f202f 






Merge branch '18608-lock-issues-v2' into 'master'
2017-10-06T16:47:27+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-10-06T16:47:27+00:00

a68a39e34120e0cf67d95e143326d03f61288cdf

Resolve "Lock issue and merge request"

Closes #18608

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




Resolve "Lock issue and merge request"

Closes #18608

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






Merge branch 'api-sentry-extra' into 'master'
2017-10-06T13:41:01+00:00

Douwe Maan
douwe@gitlab.com

2017-10-06T13:41:01+00:00

7f8e720f415ff50f791d9efd49b774c9da9ab109

Send API parameters as extra data for sentry errors

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




Send API parameters as extra data for sentry errors

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






Send API parameters as extra data for sentry errors
2017-10-05T21:31:34+00:00

Alejandro Rodríguez
alejorro70@gmail.com

2017-10-03T00:52:19+00:00

60a35e4230404b84d4aee8015fb7821b0b194277












Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails
2017-10-05T10:48:22+00:00

Douwe Maan
douwe@selenight.nl

2017-10-05T10:48:22+00:00

0c0c2ecd99cd5c4cb22a0c045f8d45d315203832

# Conflicts:
#	app/controllers/admin/users_controller.rb
#	app/controllers/confirmations_controller.rb
#	app/controllers/profiles/emails_controller.rb
#	app/models/user.rb
#	app/services/emails/base_service.rb
#	app/services/emails/destroy_service.rb
#	app/views/devise/mailer/confirmation_instructions.html.haml
#	lib/api/users.rb
#	spec/services/emails/destroy_service_spec.rb





# Conflicts:
#	app/controllers/admin/users_controller.rb
#	app/controllers/confirmations_controller.rb
#	app/controllers/profiles/emails_controller.rb
#	app/models/user.rb
#	app/services/emails/base_service.rb
#	app/services/emails/destroy_service.rb
#	app/views/devise/mailer/confirmation_instructions.html.haml
#	lib/api/users.rb
#	spec/services/emails/destroy_service_spec.rb







Remove 'Repo' prefix from API entites
2017-10-05T08:48:05+00:00

Vitaliy @blackst0ne Klachkov
blackst0ne.ru@gmail.com

2017-10-05T08:48:05+00:00

c55a9ac4ae56ed29d192ea71bca9fb31f88f5dc1












Merge branch '37970-timestamped-ci' into 'master'
2017-10-03T18:16:54+00:00

Kamil Trzciński
ayufan@ayufan.eu

2017-10-03T18:16:54+00:00

da9d42f2b31c6e8263365de8b326a082ab9506ac

Hide CI section markers from job trace

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




Hide CI section markers from job trace

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






Expose GitLab features to the CI runner
2017-10-03T09:35:23+00:00

Alessio Caiazza
acaiazza@gitlab.com

2017-09-27T14:01:33+00:00

79e1f33f13095e3781bc3fc07efd52921c4ed756












Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issues-v2
2017-10-03T07:37:48+00:00

Jarka Kadlecova
jarka@gitlab.com

2017-10-03T07:37:48+00:00

c488bcd13e6e0405d990608c8695ffabe17ffcae

# Conflicts:
#	db/schema.rb





# Conflicts:
#	db/schema.rb







Merge branch '38571-fix-exception-in-raven-report' into 'master'
2017-10-02T08:35:12+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-10-02T08:35:12+00:00

664cd27faa6082d3b67e39aec7931cb6a7579031

Ensure no exception is raised when Raven tries to get the current user in API context

Closes #38571

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




Ensure no exception is raised when Raven tries to get the current user in API context

Closes #38571

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