delta/gitlab/gitlab-ce.git/app/controllers, branch docs/pages

Merge branch 'mock-ci-service' into 'master'

2017-02-27T16:43:05+00:00

Add Mock CI service/integration

See merge request !9250

Merge branch 'issue_24815' into 'master'

2017-02-27T14:14:20+00:00


fix ERR_CONTENT_LENGTH_MISMATCH on task checkboxes

See merge request !8567

Add MockCiService integration

2017-02-25T02:01:36+00:00

MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9250/

See https://gitlab.com/madlittlemods/gl-mock-ci-service

Fix issuable stale object error handler for js when updating tasklists

2017-02-24T18:13:42+00:00

Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifacts-expiration

2017-02-24T09:14:35+00:00

* upstream/master: (247 commits)
  Switched CONTRIBUTING.md style guide recommendation for method chaining
  Fix new offenses
  Stylistic tweaks
  Fix OAuth/SAML user blocking behavior
  Revert "Enable Style/DotPosition"
  Revert "Prefer leading style for Style/DotPosition"
  Revert "Enable Style/BarePercentLiterals"
  Manually correct autocorrect
  Move up delegate calls
  Exclude migrations from Style/MutableConstant
  ActiveSupport delegation is preferred over Forwardable
  Update haml_lint to work with newest rubocop
  Add explanations to cops
  Update rubocop and rubocop-rspec and regenerate .rubocop_todo.yml
  Update rubocop and rubocop-rspec and regenerate .rubocop_todo.yml
  Order cops alphabetically
  Don’t exclude some file in lib from rubocop
  Fix new offenses
  Enable Rails/Delegate
  Enable Style/WordArray
  ...

Merge branch 'create_branch_repo_less' into 'master'

2017-02-23T23:27:43+00:00


Create master branch first if project is repository-less

Closes #26687

See merge request !9009

Fix new offenses

2017-02-23T15:44:37+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.

Fix new offenses

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