Commit graph

11 commits

Author SHA1 Message Date
GitLab Bot
b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
Felipe Artur
0f59d73ef2 Rename epic column state to state_id
Rename epic column state to state_id to be consistent with
issues and merge requests
2019-08-30 11:28:20 +00:00
Patrick Bajao
d7e1357983 Add commit_id to draft_notes table
CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14520
2019-08-01 16:00:36 -05:00
Yorick Peterse
998cd8cb70
Backport EE changes for the schema specs
This backports two EE specific changes made to the schema changes. We do
not yet backport the EE prepend, as this will/can be done when
https://gitlab.com/gitlab-org/gitlab-ce/issues/58170 is implemented.
2019-07-29 13:54:15 +02:00
Yorick Peterse
8469f59d78
Backport the EE schema and migrations to CE
This backports all EE schema changes to CE, including EE migrations,
ensuring both use the same schema.

== Updated tests

A spec related to ghost and support bot users had to be modified to make
it pass. The spec in question assumes that the "support_bot" column
exists when defining the spec. In the single codebase setup this is not
the case, as the column is backported in a later migration. Any attempt
to use a different schema version or use of "around" blocks to
conditionally disable specs won't help, as reverting the backport
migration would also drop the "support_bot" column. Removing the
"support_bot" tests entirely appears to be the only solution.

We also need to update some foreign key tests now that we have
backported the EE columns. Fortunately, these changes are very minor.

== Backporting migrations

This commit moves EE specific migrations (except those for the Geo
tracking database) and related files to CE, and also removes any traces
of the ee/db directory.

Some migrations had to be modified or removed, as they no longer work
with the schema being backported. These migrations were all quite old,
so we opted for removing them where modifying them would take too much
time and effort.

Some old migrations were modified in EE, while also existing in CE. In
these cases we took the EE code, and in one case removed them entirely.
It's not worth spending time trying to merge these changes somehow as we
plan to remove old migrations around the release of 12.0, see
https://gitlab.com/gitlab-org/gitlab-ce/issues/59177 for more details.
2019-06-17 17:09:05 +02:00
Jarka Košanová
1f332ae8da Create models for issue trackers data
- create tables for storing issue trackers properties
- add model and basic logic & spec
2019-06-13 19:02:13 +02:00
Felipe Artur
bf99ce7bf8 Fix specs 2019-02-15 14:37:55 -02:00
Reuben Pereira
f40b5860d7 Add table and model for error tracking settings 2019-01-07 17:55:21 +00:00
Oswaldo Ferreira
ed3034bbb7 Allow suggesting single line changes in diffs 2018-12-13 19:17:19 +00:00
Kamil Trzciński
bef905a909 Backport EE changes 2018-11-15 12:57:13 +01:00
Kamil Trzciński
90801a43ca Validate foreign keys being indexed 2018-11-15 12:51:15 +01:00