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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update index.md filedocs/add-depractions-list	Fabio Busatto	2019-02-02	1	-0/+15
\|
*	Rename README.md to index.md	bikebilly	2019-01-28	1	-0/+0
\|
*	Add deprecations README.md	bikebilly	2019-01-28	1	-0/+0
\|
*	Merge branch 'refactor/56369-extract-jump-to-next-discussion-button' into ↵	Phil Hughes	2019-01-28	5	-10/+75
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Refactor/56369 extract jump to next discussion button Closes #56369 See merge request gitlab-org/gitlab-ce!24506
\| *	refactor(NoteableDiscussion): Extracted JumpToNextDiscussionButton to its ↵	Martin Hobert	2019-01-28	5	-10/+75
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	own component fix #56369 chore(changelog): Added changelog entry chore(prettier): Formated with prettier test(JumpToNextDiscussionButton): Added test for new component test(Refactored tests to use vue test-utils): chore(translations): Added newly generated locales Update spec/javascripts/notes/components/discussion_jump_to_next_button_spec.js chore(prettier): Formated with prettier test(JumpToNextDiscussionButton): Updated tests to use a local vue instance test(JumpToNextDiscussionButton): Running tests in async to prevent maximum stack overflow
* \|	Merge branch 'bw-enable-sourcepos' into 'master'	Robert Speicher	2019-01-28	21	-17/+113
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Enable CommonMark source line position information See merge request gitlab-org/gitlab-ce!23971
\| * \|	Fix review comments	Brett Walker	2019-01-21	16	-32/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	including refactoring, disabling sourcepos for pipelines that don't need it, and minimizing spec changes by disabling sourcepos when not testing for it explicitly.
\| * \|	Enable CommonMark source line position information	Brett Walker	2019-01-21	17	-22/+85
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds 'data-sourcepos' to tags, indicating which line of markdown it came from. Sets the stage for intelligently manipulating specific lines of markdown.
* \| \|	Merge branch 'gt-externalize-app-views-projects-pages_domains' into 'master'	Clement Ho	2019-01-28	6	-27/+84
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalize strings from `/app/views/projects/pages_domains` See merge request gitlab-org/gitlab-ce!24723
\| * \| \|	Externalize strings from `/app/views/projects/pages_domains`	George Tsiolis	2019-01-28	6	-27/+84
\| \| \| \|
* \| \| \|	Merge branch 'qa-stabalize-go_to_profile_settings' into 'master'	Mark Lapierre	2019-01-28	1	-2/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use retry to improve reliability of go_to_profile_settings Closes gitlab-org/quality/nightly#65 See merge request gitlab-org/gitlab-ce!24719
\| * \| \| \|	Use retry to stablize go_to_profile_settings	Sanad Liaquat	2019-01-28	1	-2/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-select2-helper' into 'master'	Sean McGivern	2019-01-28	1	-0/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix running a single spec file with rspec See merge request gitlab-org/gitlab-ce!24729
\| * \| \| \| \|	Fix running a single spec file with rspec	Nick Thomas	2019-01-28	1	-0/+2
\|/ / / / /
* \| \| \| \|	Merge branch '44698-recaptcha' into 'master'	Kushal Pandya	2019-01-28	3	-2/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent unload when Recaptcha is open Closes #44698 See merge request gitlab-org/gitlab-ce!24625
\| * \| \| \| \|	Prevent unload when Recaptcha is open	Rajat Jain	2019-01-28	3	-2/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'renovate/gitlab-ui-1.x' into 'master'	Kushal Pandya	2019-01-28	2	-5/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update dependency @gitlab/ui to ^1.22.0 See merge request gitlab-org/gitlab-ce!24721
\| * \| \| \| \| \|	Update dependency @gitlab/ui to ^1.22.0	Lukas 'Eipi' Eipert	2019-01-28	2	-5/+5
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '56867-wait-for-requests-before-select2' into 'master'	Sean McGivern	2019-01-28	2	-3/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wait for requests in specs before interacting with select2 Closes #56867 See merge request gitlab-org/gitlab-ce!24694
\| * \| \| \| \| \|	Wait for requests in specs before interacting with select2	Nick Thomas	2019-01-28	2	-3/+4
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'sh-bump-sidekiq-5.2.5' into 'master'	Rémy Coutable	2019-01-28	1	-2/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Sidekiq to 5.2.5 See merge request gitlab-org/gitlab-ce!24662
\| * \| \| \| \| \|	Bump Sidekiq to 5.2.5	Stan Hu	2019-01-25	1	-2/+3
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reduces duplication caused by gitlab-monitor already shipping Sidekiq 5.2.5. The only changes appear to be minor: https://github.com/mperham/sidekiq/blob/master/Changes.md
* \| \| \| \| \|	Merge branch 'fix-explore-page-star-button' into 'master'	Phil Hughes	2019-01-28	2	-4/+8
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix `star` action in the `explore` subpages See merge request gitlab-org/gitlab-ce!24693
\| * \| \| \| \|	Fix `star` action in the `explore` subpages	Riccardo Padovani	2019-01-28	2	-4/+8
\|/ / / / /
* \| \| \| \|	Merge branch 'ce-1979-2-1' into 'master'	Sean McGivern	2019-01-28	4	-2/+19
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add query method for id See merge request gitlab-org/gitlab-ce!24386
\| * \| \| \| \|	Add query method for id query	Mark Chao	2019-01-15	4	-2/+19
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '54213-standardize-token-value-capitalization-in-filter-bar' ↵	Kushal Pandya	2019-01-28	12	-45/+52
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Standardize token value capitalization in filter bar Closes #54213 See merge request gitlab-org/gitlab-ce!23846
\| * \| \| \| \|	Standardize token value capitalization in filter bar	Omar Bahareth	2019-01-28	12	-45/+52
\|/ / / / /
* \| \| \| \|	Merge branch 'increase-kubernetes-ip-address-timeout' into 'master'docs/add-note-on-redis-backup-restore	Mark Lapierre	2019-01-25	2	-5/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Auto DevOps QA: increase IP address timeout, remove quarantine Closes gitlab-qa#369 See merge request gitlab-org/gitlab-ce!24687
\| * \| \| \| \|	Auto DevOps QA: increase IP address timeout, remove quarantine	Dylan Griffith	2019-01-25	2	-5/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '53966-refactor-hashed-storage' into 'master'	Douglas Barbosa Alexandre	2019-01-25	26	-169/+330
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Hashed Storage for future Rollback functionality See merge request gitlab-org/gitlab-ce!24402
\| * \| \| \| \|	Use Gitlab::AppLogger instead of Rails.logger	Gabriel Mazetto	2019-01-25	2	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Sidekiq queue migration for HashedStorage::MigratorWorker	Gabriel Mazetto	2019-01-25	3	-1/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate jobs from `storage_migrator` to `hashed_storage:hashed_storage_migrator`.
\| * \| \| \| \|	Track when MigrateAttachmentsService is skipped	Gabriel Mazetto	2019-01-25	2	-2/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need this new state for the Geo event logic in EE
\| * \| \| \| \|	Refactor Storage Migration	Gabriel Mazetto	2019-01-25	16	-98/+147
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Specs were reviewed and improved to better cover the current behavior. There was some standardization done as well to facilitate the implementation of the rollback functionality. StorageMigratorWorker was extracted to HashedStorage namespace were RollbackerWorker will live one as well.
\| * \| \| \| \|	Extract BaseRepositoryService from MigrateRepository	Gabriel Mazetto	2019-01-25	2	-45/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will serve as new base class for both Migrate and Rollback
\| * \| \| \| \|	Move MigrationService to HashedStorage module	Gabriel Mazetto	2019-01-25	7	-36/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is part of the refactor to include a RollbackService into HashedStorage module
\| * \| \| \| \|	Prepare rake task for storage rollback	Gabriel Mazetto	2019-01-25	6	-20/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We are keeping compatibility with existing scheduled jobs.
\| * \| \| \| \|	Remove "Experimental" text from Hashed Storage settings page	Gabriel Mazetto	2019-01-25	1	-1/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'qa-ml-quarantine-rebase-test' into 'master'56871-error-tracking-does-not-error-when-given-invalid-api-key	Mark Lapierre	2019-01-25	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quarantine failing test rebase_merge_request_spec.rb See merge request gitlab-org/gitlab-ce!24682
\| * \| \| \| \|	Quarantine failing test	Mark Lapierre	2019-01-25	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dm-copy-suggestion-as-gfm' into 'master'	Phil Hughes	2019-01-25	7	-4/+94
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow suggestions to be copied and pasted as GFM See merge request gitlab-org/gitlab-ce!24600
\| * \| \| \| \| \|	Allow suggestions to be copied and pasted as GFM	Douwe Maan	2019-01-25	5	-3/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Supports both suggestions transformed from GFM to HTML and from GFM to HTML to Vue component.
\| * \| \| \| \| \|	Wrap suggestion note in .note-text.md for consistent styling + behavior	Douwe Maan	2019-01-25	2	-1/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'osw-adjusts-suggestions-unable-to-be-applied' into 'master'	Phil Hughes	2019-01-25	4	-16/+22
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjusts suggestions unable to be applied Closes #56690 See merge request gitlab-org/gitlab-ce!24603
\| * \| \| \| \| \| \|	Adjusts suggestions unable to be applied	Oswaldo Ferreira	2019-01-25	4	-16/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Presents the system error message when available, when applying suggestions 2. Adjusts target branch updates affecting MRs pointing to it when there are previously created suggestions in the MR. We just need to compare the HEAD shas from position and MR source branch.
* \| \| \| \| \| \| \|	Merge branch '56860-fix-spec-race-condition-upside-the-head' into 'master'	Douglas Barbosa Alexandre	2019-01-25	1	-0/+3
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a JS race in a spec Closes #56860 See merge request gitlab-org/gitlab-ce!24684
\| * \| \| \| \| \| \|	Fix a JS race in a spec	Nick Thomas	2019-01-25	1	-0/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'qa-fix-branches-spec' into 'master'	Mark Lapierre	2019-01-25	5	-2/+28
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix transient failure in add_list_delete_branches_spec.rb Closes gitlab-org/quality/nightly#62 See merge request gitlab-org/gitlab-ce!24644
\| * \| \| \| \| \| \|	Fix failing E2E test	Mark Lapierre	2019-01-25	5	-2/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sometimes add_list_delete_branches_spec.rb would not wait after deleting a branch before checking that the branch was done. It would fail when the UI was still processing. This checks that the loading icon is gone before returning from delete_branch. It also makes sure credentials are added properly after recent changes to QA::Git::Repository