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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add foreign key on trigger requestszj-fk-ci-triggers	Z.J. van de Weg	2017-04-11	2	-0/+17
\| \| \| \| \| \| \| \| \|	I started out as I missed the foreign key on ci_triggers and projects. However, it seemed Yorick caught this already on gitlab-org/gitlab-ce!9388. Still I found a missing foreign key, between the trigger requests and triggers. This commit adds it, and removes the depend: :destroy on the Rails model Ci::Triggers
*	Periodically clean up temporary upload files to recover storage space	blackst0ne	2017-04-10	2	-1/+24
\|
*	Merge branch 'master' into new-resolvable-discussion	Luke "Jared" Bennett	2017-04-07	5	-1/+91
\|\
\| *	Merge branch ↵	Sean McGivern	2017-04-07	4	-1/+40
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'dosuken123/gitlab-ce-2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-implementation-with-quick-ui' into 'master' Add "engineering" UI for Pipeline Schedule See merge request !10533
\| \| *	Yet, another errorsdosuken123/gitlab-ce-2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-implementation-with-quick-ui	Kamil Trzcinski	2017-04-07	1	-1/+1
\| \| \|
\| \| *	Another round of code review	Kamil Trzcinski	2017-04-07	1	-2/+8
\| \| \|
\| \| *	Update migrations	Kamil Trzcinski	2017-04-07	4	-45/+14
\| \| \|
\| \| *	Update tests to cover trigger schedule	Kamil Trzcinski	2017-04-07	1	-1/+3
\| \| \|
\| \| *	Fix ref reference	Kamil Trzcinski	2017-04-07	2	-0/+62
\| \| \|
\| * \|	Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master'	Douwe Maan	2017-04-07	2	-0/+51
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Protected Tags Closes #18471 See merge request !10356
\| \| *	Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'	Kushal Pandya	2017-04-06	8	-1/+132
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # spec/lib/gitlab/import_export/all_models.yml
\| \| * \	Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tags	James Edwards-Jones	2017-04-06	46	-2/+75
\| \| \|\ \
\| \| * \| \|	Protected Tags backend review changes	James Edwards-Jones	2017-04-06	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added changelog
\| \| * \| \|	Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'	Kushal Pandya	2017-04-06	13	-45/+240
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/dispatcher.js # app/assets/stylesheets/pages/projects.scss
\| \| * \| \| \|	Renamed ProtectedTag push_access_levels to create_access_levels	James Edwards-Jones	2017-04-04	2	-10/+10
\| \| \| \| \| \|
\| \| * \| \| \|	Removed unnecessary table ‘protected_tag_merge_access_levels’	James Edwards-Jones	2017-03-31	2	-30/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed timestamps on protected_tags
\| \| * \| \| \|	Database migrations for protected tags	James Edwards-Jones	2017-03-31	2	-1/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added schema.rb for protected tags
* \| \| \| \| \|	Update schema.rb	Douwe Maan	2017-04-07	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion	Luke "Jared" Bennett	2017-04-07	7	-1/+83
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-04-07	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	8998_skip_pending_commits_if_not_head * upstream/master: (58 commits) Fix icon name error Rewrite system note helper Change edit icon Leave icon area blank if legacy note; remove diamond icon Fix positioning of note icons Fix newline errors Add remaining system note icons Add system notes icon helper; add icons Fixed specs Updated JS that was causing the hints to appear & then disappear Update tests Fix broken spinach test Reuse code Improve shortcuts code Adds ShortcutsDashboardNavigation to globals comment since its a global variable Fix shortcut specs Reorganize shortcut help menu Change todos shortcut to shift Change shortcuts Switch global shortcuts to shift; reuse key styles from help menu Map bindings to lowercase letters; only show key bindings when using keyboard shortcut ...
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-04-07	10	-1/+151
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	8998_skip_pending_commits_if_not_head * upstream/master: (197 commits) Add text to break up diagrams Implement review comments from @DouweM for !10467. Fix rubocop offence Linking to edit file directly Optimise trace handling code to use streaming instead of full read Use config.toml to configure Gitaly Fix indexes in container repositories table Recent search history for issues Fix rubocop Use change direction in spec Use be_pending Improve trigger_schedule.rb Implement a offset calculation on cron_parser_spec Clean up trigger_schedule_worker_spec.rb Improve instantiate recursion in cron_parser.rb Fix unnecessary changes in schema.rb Add empty line in cron_parser.rb Use parenthesis for respond_to :ref Define next_time as let in trigger_schedule_spec Remove next_run_at: nil from trigger_schedule_spec ...
\| * \| \| \| \| \|	Fix rubocop offenses8998_skip_pending_commits_if_not_head	Lin Jen-Shin	2017-04-06	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Bump schema version	Lin Jen-Shin	2017-04-06	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Also track auto-cancelling in jobs, detail:	Lin Jen-Shin	2017-04-06	3	-0/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Not only tracking auto-cancelling in pipelines, we'll also track this in jobs because pipelines could be retried and the information would get lost when this happened. Also erase auto-cancelling relation for pipelines when they're retried.
\| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-04-06	44	-3/+56
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	8998_skip_pending_commits_if_not_head * upstream/master: Show CI status as Favicon on Pipelines, Job and MR pages STL file viewer Wait for the PDF to be loaded before doing anything remove unnecessary lease as cron job Search for opened MRs - include reopened MRs ProjectsFinder should handle more options Clearly show who triggered the pipeline in email Make it possible to preview pipeline success/failed emails Add remove_concurrent_index to database helper fix project authorizations migration issue attempt to fix migration Revert schema.rb attempt to fix db failure Periodically mark projects that are stuck in importing as failed Fix html structure to prevent tooltip from not hidding Enable creation of deploy keys with write access via the API
\| * \| \| \| \| \| \|	Fix rolling back for MySQL	Lin Jen-Shin	2017-04-06	4	-57/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-04-06	3	-3/+72
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	8998_skip_pending_commits_if_not_head * upstream/master: (64 commits) Merge branch 'open-redirect-fix-continue-to' into 'security' Merge branch 'open-redirect-host-fix' into 'security' Merge branch 'path-disclosure-proj-import-export' into 'security' Merge branch '29364-private-projects-mr-fix' Merge branch '30125-markdown-security' Issue title realtime Update CHANGELOG.md for 8.16.9 Update CHANGELOG.md for 8.17.5 Update CHANGELOG.md for 9.0.4 Add "search" optional param and docs for V4 Use PDFLab to render PDFs in GitLab Separate Scala from Java in CI examples Fix broken link Reorganize CI examples, add more links Refactor CI index page Remove deprecated field from workhorse response Use gitlab-workhorse 1.4.3 Document how ETag caching middleware handles query parameters Make group skip validation in the frontend Use NamespaceValidator::WILDCARD_ROUTES in ETag caching middleware ...
\| * \| \| \| \| \| \|	Restore schema	Lin Jen-Shin	2017-04-05	1	-6/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	split up migrations	Rydkin Maxim	2017-04-04	2	-15/+42
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix migration error	Rydkin Maxim	2017-04-04	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	replace on_delete in migration with database type related expression	Rydkin Maxim	2017-04-04	1	-1/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix on_delete	Rydkin Maxim	2017-04-04	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	rename `auto_canceled_by` and add foreign key	Rydkin Maxim	2017-04-04	2	-13/+20
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	add auto-cancel for pending pipelines on branch, if they are not HEAD	Rydkin Maxim	2017-04-04	3	-2/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix changelog MR reference add non-HEAD builds finder and add `created` pipelines to scope add spec for auto-cancel non-HEAD pipelines and refactor create_pipeline_service_spec more refactoring for spec adds option for auto-cancel into CI/CD settings fix spec to new configuration fix rubocop fix schema.rb fix schema.rb replace Gitlab 9.0 with 9.1 in doc change wording on pipeline settings added auto_canceled_by field as identifier of autocancel subject remove unnecessary index replace service with retry_lock replace auto_cancel_pending_pipelines boolean setting with integer (and enum in model) fix schema.rb fix schema.rb remove projekt attribute and clean up spec clean up spec withcouple of shared examples added spec for "It does not cancel current pipeline" scenario add some specs to auto-cancel add spec for another branch pipelines
* \| \| \| \| \| \| \|	Update schema.rb version	Douwe Maan	2017-04-06	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' into new-resolvable-discussion	Douwe Maan	2017-04-06	10	-1/+151
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/filtered_search/dropdown_hint.js # app/views/shared/issuable/_search_bar.html.haml
\| * \| \| \| \| \| \|	Merge branch 'rubocop-fix-migration-two-factor-columns' into 'master'	Stan Hu	2017-04-06	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed rubocop failure for the add_two_factor_columns_migration See merge request !10505
\| \| * \| \| \| \| \|	Fixed rubocop failure for the add_two_factor_columns_migrationrubocop-fix-migration-two-factor-columns	Jose Ivan Vargas	2017-04-06	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch ↵	Kamil Trzciński	2017-04-06	4	-0/+61
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-implementation' into 'master' Resolve "Run CI/CD pipelines on a schedule" - "Basic backend implementation" See merge request !10133
\| \| * \| \| \| \| \| \|	Fix unnecessary changes in schema.rb	Shinya Maeda	2017-04-06	1	-3/+3
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Rename cron_time_zone to cron_timezone. Separate add_concurrent_foreign_key.	Shinya Maeda	2017-04-06	3	-13/+20
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix rubocop issues. Use add_concurrent_foreign_key.	Shinya Maeda	2017-04-06	3	-11/+10
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Maintain MR	Shinya Maeda	2017-04-06	2	-32/+0
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add ci_trigger_schedules table	Shinya Maeda	2017-04-06	2	-0/+57
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add ref to ci_triggers	Shinya Maeda	2017-04-06	2	-0/+30
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Remove old migration file	Shinya Maeda	2017-04-06	1	-45/+0
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Rollback	Shinya Maeda	2017-04-06	1	-18/+0
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add scheduled_trigger model. Add cron parser. Plus, specs.	Shinya Maeda	2017-04-06	2	-3/+66
\| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'feature/multi-level-container-registry-images' into 'master'	Kamil Trzciński	2017-04-06	2	-0/+27
\| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Multi-level container registry images Closes #17801 See merge request !10109
\| \| * \| \| \| \| \|	Merge commit '46e4ed6bd0c8c256bce6d35b4bb992d77fd09971' into ↵feature/multi-level-container-registry-images	Grzegorz Bizon	2017-04-06	46	-2/+75
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/multi-level-container-registry-images * commit '46e4ed6bd0c8c256bce6d35b4bb992d77fd09971': (28 commits) Award emoji button smiley animation Introduced empty/error UX states to environments monitoring. Github import rake task Remove individual modal width styles Fix RuboCop for removing index Link to docs site for file in doc/ Disable invalid service templates (again) Show CI status as Favicon on Pipelines, Job and MR pages STL file viewer Wait for the PDF to be loaded before doing anything remove unnecessary lease as cron job Search for opened MRs - include reopened MRs ProjectsFinder should handle more options Clearly show who triggered the pipeline in email Make it possible to preview pipeline success/failed emails Add remove_concurrent_index to database helper Add more tests for subgroups feature Large features by the 1st, small ones by the 3rd Ask people to create EE MRs on the 7th fix project authorizations migration issue ...