delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use active tense, feedback from:test-merge-request-4093	Lin Jen-Shin	2016-06-16	1	-9/+9
\| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12501303
*	Fix typo. It's ivar and the column was called locked	Lin Jen-Shin	2016-06-16	1	-1/+1
\| \| \| \|	Again! For admin.
*	blank line between setup and expectation, feedback:	Lin Jen-Shin	2016-06-16	1	-0/+4
\| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093/diffs#note_12501266 and: https://robots.thoughtbot.com/four-phase-test
*	Use FIXME instead, feedback from:	Lin Jen-Shin	2016-06-16	1	-2/+2
\| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093/diffs#note_12501400
*	Use font awesome instead of Unicode. Feedback from:	Lin Jen-Shin	2016-06-15	1	-1/+2
\| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/commit/53121601f38155e926eed300160f79dd4bc0768b#note_12465224
*	Adopt the rename from ci_commits to ci_pipelines	Lin Jen-Shin	2016-06-15	2	-2/+2
\|
*	Fix typo. It's ivar and the column was called locked	Lin Jen-Shin	2016-06-15	1	-1/+1
\|
*	Return the association and check it in controller instead:	Lin Jen-Shin	2016-06-14	4	-4/+9
\| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4641#note_12444891
*	Merge branch 'prefer-assign_to' into feature/runner-lock-on-project	Lin Jen-Shin	2016-06-14	4	-4/+8
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	* prefer-assign_to: Give 409 Conflict whenever the runner was already enabled We're checking return value rather than rescuing exceptions Prefer Runner#assign_to instead of creating directly
\| *	Give 409 Conflict whenever the runner was already enabledprefer-assign_to	Lin Jen-Shin	2016-06-14	4	-4/+8
\| \|
\| *	We're checking return value rather than rescuing exceptions	Lin Jen-Shin	2016-06-14	1	-1/+1
\| \|
\| *	Prefer Runner#assign_to instead of creating directly	Lin Jen-Shin	2016-06-14	1	-1/+1
\| \|
* \|	Merge branch 'master' into feature/runner-lock-on-project	Lin Jen-Shin	2016-06-14	582	-1513/+3372
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (147 commits) Update CHANGELOG Remove deprecated issues_tracker and issues_tracker_id from project Schema doesn’t reflect the changes of the last 3 migrations Revert CHANGELOG Also rename "find" in the specs Change to new Notes styleguide Add guide on changing a document's location Change logs.md location in README Move logs/logs.md to administration/logs.md Make "four phase test" Only show branches for revert / cherry-pick Instrument all Banzai::ReferenceParser classes Removed old comment from update_column_in_batches Update columns in batches until no rows are left Remove counters from Pipeline navigation Handle NULL migration errors in migration helpers Fix typo causing related branches to Error 500 Improved SVG sanitizer specs to include smoke tests for clean. Refactored SVG sanitizer Added SVG sanitizer fix to the changelog ...
\| *	Merge branch 'retry-spinach-tests' into 'master'	Rémy Coutable	2016-06-14	1	-3/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Retry spinach tests in case of failure using rerun reporter ## What does this MR do? Fixes Spinach tests to retry on tests on master See merge request !4539
\| \| *	Revert CHANGELOGretry-spinach-tests	Kamil Trzcinski	2016-06-13	1	-1/+0
\| \| \|
\| \| *	Use bundle exec to run spinach	Kamil Trzcinski	2016-06-10	1	-1/+1
\| \| \|
\| \| *	Merge remote-tracking branch 'origin/master' into retry-spinach-tests	Kamil Trzcinski	2016-06-10	570	-1175/+2976
\| \| \|\
\| \| * \|	Retry spinach tests in case of failure using rerun reporter	Kamil Trzcinski	2016-06-08	2	-3/+2
\| \| \| \|
\| * \| \|	Merge branch 'remove-deprecated-issues-tracker-columns-from-projects' into ↵	Robert Speicher	2016-06-13	8	-63/+13
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Remove deprecated issues_tracker and issues_tracker_id from project model Closes #3941 See merge request !4603
\| \| * \| \|	Update CHANGELOGremove-deprecated-issues-tracker-columns-from-projects	Douglas Barbosa Alexandre	2016-06-13	1	-0/+1
\| \| \| \| \|
\| \| * \| \|	Remove deprecated issues_tracker and issues_tracker_id from project	Douglas Barbosa Alexandre	2016-06-13	7	-63/+12
\| \|/ / /
\| * \| \|	Merge branch 'fix-schema' into 'master'	Robert Speicher	2016-06-13	1	-4/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update schema.rb for most recent migrations Fixes #18532 See merge request !4636
\| \| * \| \|	Schema doesn’t reflect the changes of the last 3 migrations	Douglas Barbosa Alexandre	2016-06-13	1	-4/+3
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The schema doesn’t reflect the changes of the last 3 migrations: * 20160610140403_remove_notification_setting_not_null_constraints.rb * 20160610201627_migrate_users_notification_level.rb * 20160610301627_remove_notification_level_from_users.rb
\| * \| \|	Merge branch 'dz-cleanup-counters' into 'master'	Dmitriy Zaporozhets	2016-06-13	1	-2/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove counters from Pipeline navigation * counters are heavy from UI perspective * duplicates information from tabs below * shows 0 for less active projects. Jumps from 0 to N constantly. I think we should render counters only when necessary and only for filters ( tabs on white bg ). Exception: issues, merge requests in top navigation as status of project popularity and action required from maintainers cc @grzesiek @ayufan @jschatz1 See merge request !4617
\| \| * \| \|	Remove counters from Pipeline navigationdz-cleanup-counters	Dmitriy Zaporozhets	2016-06-13	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Merge branch 'gitlab-auth-method-names' into 'master'	Douwe Maan	2016-06-13	8	-22/+22
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve Gitlab::Auth method names Auth.find was a very generic name for a very specific method. Auth.find_in_gitlab_or_ldap was inaccurate in GitLab EE where it also looks in Kerberos. See merge request !4589
\| \| * \| \| \|	Also rename "find" in the specs	Jacob Vosmaer	2016-06-13	1	-5/+5
\| \| \| \| \| \|
\| \| * \| \| \|	Improve Gitlab::Auth method names	Jacob Vosmaer	2016-06-10	8	-17/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Auth.find was a very generic name for a very specific method. Auth.find_in_gitlab_or_ldap was inaccurate in GitLab EE where it also looks in Kerberos.
\| * \| \| \| \|	Merge branch 'style/enable-multiline-block-chain-rubocop-cop' into 'master'	Robert Speicher	2016-06-13	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Style/MultilineBlockChain rubocop style cop Avoid multi-line chains of blocks. See #17478. See merge request !4349
\| \| * \| \| \| \|	Enable Style/MultilineBlockChain rubocop style copstyle/enable-multiline-block-chain-rubocop-cop	Grzegorz Bizon	2016-06-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See #17478
\| * \| \| \| \| \|	Merge branch 'upgrade-brakeman' into 'master'	Robert Speicher	2016-06-13	2	-24/+6
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update brakeman from 3.2.1 to 3.3.2 Removes a few dependencies. Changelog: https://github.com/presidentbeef/brakeman/blob/master/CHANGES See merge request !4627
\| \| * \| \| \| \| \|	Update brakeman from 3.2.1 to 3.3.2	Connor Shea	2016-06-12	2	-24/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes a few dependencies. Changelog: https://github.com/presidentbeef/brakeman/blob/master/CHANGES
\| * \| \| \| \| \| \|	Merge branch 'fix-related-branches-error-500' into 'master'	Kamil Trzciński	2016-06-13	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo causing related branches to Error 500 From Sentry: https://sentry.gitlap.com/gitlab/gitlabcom/issues/6154/ See merge request !4611
\| \| * \| \| \| \| \| \|	Fix typo causing related branches to Error 500fix-related-branches-error-500	Stan Hu	2016-06-12	1	-1/+1
\| \| \|/ / / / / /
\| * \| \| \| \| \| \|	Merge branch 'fix-bulk-assign-labels' into 'master'	Jacob Schatz	2016-06-13	2	-4/+30
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes bulk-assign label for multiple issues not having the same labels ## What does this MR do? Fixes a bug when bulk-assigning a label to multiple issues while the label is present in on the issues on the selection. ## Screenshots (if relevant) Before Bugfix <img src="/uploads/ad1f290bcf3930177a3a71c69cbe5325/before-bugfix.gif" width="700"/> After Bugfix <img src="/uploads/1f04d6bf027806fb13ca3773febda744/bugfix.gif" width="700"/> ## Does this MR meet the acceptance criteria? - [x] Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) See merge request !4602
\| \| * \| \| \| \| \| \|	Fixes a bug when assigning a label to multiple issuesfix-bulk-assign-labels	Alfredo Sumaran	2016-06-10	2	-4/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes the case when we want to assign a label to multiple issues and one of the issues has already the label we want to apply.
\| * \| \| \| \| \| \| \|	Merge branch 'artifacts-when' into 'master'	Rémy Coutable	2016-06-13	4	-1/+78
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added when to artifacts The syntax for this will be: ``` job: artifacts: when: on_failure ``` cc @grzesiek @tmaczukin Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4034 See merge request !4201
\| \| * \ \ \ \ \ \ \	Merge remote-tracking branch 'origin/master' into artifacts-when	Kamil Trzcinski	2016-06-13	605	-1418/+3670
\| \| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'cache-apt-and-ruby-only' into 'master'	Rémy Coutable	2016-06-13	2	-3/+4
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache only apt and ruby from vendor ## What does this MR do? Optimises caching mechanism when testing gitlab-ce/ee repositories. See merge request !4619
\| \| * \| \| \| \| \| \| \| \|	Cache only apt and ruby from vendorcache-apt-and-ruby-only	Kamil Trzcinski	2016-06-12	2	-3/+4
\| \| \| \|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since introduction of gitignore the vendor folder contains also gitignores which affects detection when to update a cache. We explicitly cache only apt and ruby folders.
\| * \| \| \| \| \| \| \| \|	Merge branch 'instrument-reference-parsers' into 'master'	Rémy Coutable	2016-06-13	2	-6/+12
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instrument all Banzai::ReferenceParser classes ## What does this MR do? This MR instruments all the classes in the `Banzai::ReferenceParser` namespace. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? The classes in question weren't instrumented meaning we have no idea how they're performing in production. ## What are the relevant issue numbers? None. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [ ] ~~API support added~~ - [ ] ~~Tests~~ - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4620
\| \| * \| \| \| \| \| \| \| \|	Instrument all Banzai::ReferenceParser classesinstrument-reference-parsers	Yorick Peterse	2016-06-13	2	-6/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now that this code is no longer part of Banzai::Filter it needs to be instrumented explicitly.
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'doc-styleguide-move-locations' into 'master'	Achilleas Pipinellis	2016-06-13	1	-0/+42
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add guide on changing a document's location ## What does this MR do? Add a documentation styleguide when changing a document's location. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/3349 See merge request !4624
\| \| * \| \| \| \| \| \| \| \| \|	Add guide on changing a document's location	Achilleas Pipinellis	2016-06-13	1	-0/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-notes-doc-styleguide' into 'master'	Achilleas Pipinellis	2016-06-13	1	-5/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change to new Notes styleguide See merge request !4625
\| \| * \| \| \| \| \| \| \| \| \| \|	Change to new Notes styleguide	Achilleas Pipinellis	2016-06-13	1	-5/+5
\| \| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-migration-helper-race-conditions' into 'master'	Rémy Coutable	2016-06-13	2	-6/+20
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix migration helper race conditions ## What does this MR do? This MR fixes two problems with the migration helpers: 1. An error in `change_column_null` would not drop the previously created column 2. `update_column_in_batches` would rely on the number of rows in a table to determine how many to update. This meant that newly inserted rows (after the `COUNT`) would not be taken into account. This MR also removes an outdated comment for `update_column_in_batches`. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? See above. ## What are the relevant issue numbers? Fixes #18483 ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] ~~API support added~~ - [ ] Tests - [x] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4618
\| \| * \| \| \| \| \| \| \| \| \| \|	Removed old comment from update_column_in_batchesfix-migration-helper-race-conditions	Yorick Peterse	2016-06-13	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Update columns in batches until no rows are left	Yorick Peterse	2016-06-13	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of updating a fixed number of rows (based on the amount of rows available at the start of the update) the method "update_column_in_batches" will now continue updating rows until it runs out of rows to process. For a table with a high rate of inserts this may result in the migration taking quite some time. However, the alternative is not all rows being updated or the "change_column_null" method raising an error due to there being NULL values.
\| \| * \| \| \| \| \| \| \| \| \| \|	Handle NULL migration errors in migration helpers	Yorick Peterse	2016-06-13	2	-2/+15
\| \| \| \|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures that whenever changing the NULL constraint of a column fails we still drop the column.