delta/gitlab/gitlab-ce.git/lib, branch remove-require-context-users-bundle

Merge branch 'dm-meer-blauw-op-straat' into 'master'

2017-02-23T17:19:28+00:00


Enable (and disable) more RuboCops

See merge request !9432

Merge branch 'fix/gb/pipeline-retry-skipped-jobs' into 'master'

2017-02-23T17:09:27+00:00


Fix reprocessing skipped jobs when retrying pipeline

See merge request !9436

Merge branch 'api-remove-attributes_for_keys' into 'master'

2017-02-23T16:34:55+00:00


Use grape validation in the members API.

See merge request !9471

Fix new offenses

2017-02-23T15:44:37+00:00

Stylistic tweaks

2017-02-23T15:33:20+00:00

Fix OAuth/SAML user blocking behavior

2017-02-23T15:33:20+00:00

Revert "Enable Style/DotPosition"

2017-02-23T15:33:19+00:00

This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9.

# Conflicts:
#	.rubocop.yml
#	.rubocop_todo.yml
#	lib/gitlab/ci/config/entry/global.rb
#	lib/gitlab/ci/config/entry/jobs.rb
#	spec/lib/gitlab/ci/config/entry/factory_spec.rb
#	spec/lib/gitlab/ci/config/entry/global_spec.rb
#	spec/lib/gitlab/ci/config/entry/job_spec.rb
#	spec/lib/gitlab/ci/status/build/factory_spec.rb
#	spec/lib/gitlab/incoming_email_spec.rb

Revert "Prefer leading style for Style/DotPosition"

2017-02-23T15:33:05+00:00

This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.

Revert "Enable Style/BarePercentLiterals"

2017-02-23T15:32:42+00:00

This reverts commit 96bef54154e669f9a3e92c3a4bc76c0be3a52e48.

Move up delegate calls

2017-02-23T15:32:42+00:00