delta/gitlab/gitlab-ce.git/db, branch gitlab-database-fix gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'fix/mwbs-to-mwps' into 'master' 2017-03-01T20:30:51+00:00 Douwe Maan douwe@gitlab.com 2017-03-01T20:30:51+00:00 7e2ad5d47a1d95281e2a217538dae67107a584c2 Rename MWBS to MWPS Closes #24707 See merge request !9335 

Rename MWBS to MWPS

Closes #24707

See merge request !9335
 Disable the inheritance column of services in DisableInvalidServiceTemplates migration 2017-03-01T13:06:50+00:00 Rémy Coutable remy@rymai.me 2017-03-01T10:26:44+00:00 2f40fc521e572fb4043cfa5e57616b4e5214033a 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 <remy@rymai.me> 
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 <remy@rymai.me>
Update occurrences of MWBS to MWPS 2017-03-01T11:02:02+00:00 James Lopez james@jameslopez.es 2017-02-17T13:56:13+00:00 a0101ebf84ed397899df8f3a017d2b25dc45db57 Rename column in the database Rename fields related to import/export feature Rename API endpoints Rename documentation links Rename the rest of occurrences in the code Replace the images that contain the words "build succeeds" and docs referencing to them Make sure pipeline is green and nothing is missing. updated doc images renamed only_allow_merge_if_build_succeeds in projects and fixed references more updates fix some spec failures fix rubocop offences fix v3 api spec fix MR specs fixed issues with partials fix MR spec fix alignment add missing v3 to v4 doc wip - refactor v3 endpoints fix specs fix a few typos fix project specs copy entities fully to V3 fix entity error more fixes fix failing specs fixed missing entities in V3 API remove comment updated code based on feedback typo fix spec 
 Rename column in the database
 Rename fields related to import/export feature
 Rename API endpoints
 Rename documentation links
 Rename the rest of occurrences in the code
 Replace the images that contain the words "build succeeds" and docs referencing to them
 Make sure pipeline is green and nothing is missing.

updated doc images

renamed only_allow_merge_if_build_succeeds in projects and fixed references

more updates

fix some spec failures

fix rubocop offences

fix v3 api spec

fix MR  specs

fixed issues with partials

fix MR spec

fix alignment

add missing v3 to v4 doc

wip - refactor v3 endpoints

fix specs

fix a few typos

fix project specs

copy entities fully to V3

fix  entity error

more fixes

fix failing specs

fixed missing entities in V3 API

remove comment

updated code based on feedback

typo

fix spec
Fix migration without DOWNTIME clause specified 2017-02-28T06:11:54+00:00 Ruben Davila rdavila84@gmail.com 2017-02-28T05:38:37+00:00 eb90e3278ae2fa516e3b6a30ff2fad23ae668c9b 






Add development fixtures for nested groups
2017-02-27T15:28:53+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

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

74faf4ca517200c5458e88d5f5b908d074bf64c9

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







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

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

Robert Speicher
robert@gitlab.com

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

6e2f2f5da7387c7813b23304f51e917596f2b170


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

See merge request !9207





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

Douwe Maan
douwe@selenight.nl

2017-02-15T23:28:29+00:00

faa2e2df8fb95655ebfb8523689295e223005d9d












Consistently create, update, and delete files, taking CRLF settings into account
2017-02-24T15:55:01+00:00

Douwe Maan
douwe@selenight.nl

2017-02-13T21:09:36+00:00

0625af3bcb75b3186a3286eee662a7ff8442f130












Remove the default value for the `users.ghost` database column.
2017-02-24T11:20:20+00:00

Timothy Andrew
mail@timothyandrew.net

2017-02-07T06:43:24+00:00

3bd2a98f64a12a2e23a6b9ce77427a9c2033a6bf

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





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

Timothy Andrew
mail@timothyandrew.net

2017-02-06T12:07:05+00:00

8e684809765fa866a125c176327825ebc565f5b3

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





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