Commit Graph

6 Commits

Author SHA1 Message Date
GitLab Bot 556c79d6cc Add latest changes from gitlab-org/gitlab@master 2019-12-02 15:06:36 +00:00
GitLab Bot 80f61b4035 Add latest changes from gitlab-org/gitlab@master 2019-09-18 14:02:45 +00:00
Jan Provaznik 0fc9f9d3e7 Add version 4.2 to all existing migrations
DB schema generated by a migration may look different in
rails 4 and 5 (because rails 5 may use different default values).
For this reason it's important to explicitly set for which rails
version a migration was written for.

See https://stackoverflow.com/questions/35929869/activerecordmigration-deprecation-warning-asks-for-rails-version-but-im-no/35930912#35930912
2018-11-22 13:18:28 +01:00
Gabriel Mazetto f21e655b61 disable_statement_timeout doesn't require any argument anymore
it will decide the method for disable statement_timeout upon
per transaction or per session, based on how it's called.

When calling with a block, block will be executed and it will use
session based statement_timeout, otherwise will default to existing
behavior.
2018-08-11 04:15:59 +02:00
Gabriel Mazetto 119c49172f Fix specs to use `disable_statement_timeout` correctly 2018-08-10 20:40:00 +02:00
Bob Van Landuyt 7ea08566f3 Remove `permanent` from `redirect_routes`
This removes the column that was added in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15670 since we
will no longer be allowing _permanent_ redirects
2018-03-28 14:12:07 +02:00