delta/gitlab/gitlab-ce.git/db, branch api-v4-doc

Disable the inheritance column of services in DisableInvalidServiceTemplates migration

2017-03-01T13:06:50+00:00

The `unless defined?(Service)` was useless since in production env,
models are eager loaded, thus we wouldn't disable the STI, resulting in
the following error:

The single-table inheritance mechanism failed to locate the subclass:
'GitlabCiService'. This error is raised because the column 'type' is
reserved for storing the class in case of inheritance. Please rename
this column if you didn't intend it to be used for storing the
inheritance class or overwrite Service.inheritance_column to use another
column for that
information./opt/gitlab/embedded/service/gitlab-rails/db/post_migrate/20170211073944_disable_invalid_service_templates.rb:11:in `up'

Signed-off-by: Rémy Coutable

Fix migration without DOWNTIME clause specified

2017-02-28T06:11:54+00:00

Add development fixtures for nested groups

2017-02-27T15:28:53+00:00

Signed-off-by: Dmitriy Zaporozhets

Merge branch 'dm-fix-web-edit-new-lines' into 'master'

2017-02-24T21:57:47+00:00


Consistently create, update, and delete files, taking CRLF settings into account

See merge request !9207

Rename commit_file, commit_dir and remove_file and update specs

2017-02-24T15:55:01+00:00

Consistently create, update, and delete files, taking CRLF settings into account

2017-02-24T15:55:01+00:00

Remove the default value for the `users.ghost` database column.

2017-02-24T11:20:20+00:00

The default (false) is not strictly required, and this lets us avoid a
potentially expensive migration

Use a `ghost` boolean to track ghost users.

2017-02-24T11:20:20+00:00

Rather than using a separate `ghost` state. This lets us have the benefits of
both ghost and blocked users (ghost: true, state: blocked) without having to
rewrite a number of queries to include cases for `state: ghost`.

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
  ...

Revert "Prefer leading style for Style/DotPosition"

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

This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.