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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add specs for new pipeline action for JSON format30237-pipelines-actions-make-2-requests	Grzegorz Bizon	2017-05-05	1	-0/+36
\|
*	Use wrap_parameters in pipelines controller	Grzegorz Bizon	2017-05-05	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|	This makes it possible to workaround a bug in `safe_constantize` which caused a `LoadError` exception when doing ``` "Pipeline".safe_constantize LoadError: Unable to autoload constant Pipeline, expected /home/grzesiek/gdk/gitlab/app/models/ci/pipeline.rb to define it ``` See https://github.com/rails/rails/issues/28854 for more details.
*	Respond with no content for pipeline JSON actions	Grzegorz Bizon	2017-05-05	1	-6/+2
\|
*	Retry and cancel endpoints send 204 json response. Request is made with type ↵	Filipa Lacerda	2017-05-05	2	-3/+19
\| \| \| \|	json
*	Merge branch '31271-fixmr-target-branch-selector-dropdown' into 'master'	Jacob Schatz	2017-05-04	4	-3/+51
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix MR target branch select dropdown placement cut-off Closes #31271 See merge request !10902
\| *	Fix MR target branch selector dropdown placement cut-off31271-fixmr-target-branch-selector-dropdown	Eric Eastwood	2017-05-01	4	-3/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31271 When the dropdown items are too wide, constrain the dropdown to the offsetParent. Otherwise, let it naturally flow as Select2 wants.
* \|	Merge branch 'deploy-keys-load-async' into 'master'	Filipa Lacerda	2017-05-04	27	-37/+961
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deploy keys load async Closes #29667 See merge request !10973
\| * \|	Fixed Karma specdeploy-keys-load-async	Phil Hughes	2017-05-04	2	-4/+13
\| \| \|
\| * \|	Updated webpack config	Phil Hughes	2017-05-04	2	-5/+2
\| \| \|
\| * \|	Merge branch 'master' into deploy-keys-load-async	Phil Hughes	2017-05-04	203	-1298/+4346
\| \|\ \
\| * \| \|	Fixed karma specs	Phil Hughes	2017-05-03	1	-2/+2
\| \| \| \|
\| * \| \|	Merge branch 'master' into deploy-keys-load-async	Phil Hughes	2017-05-03	472	-2184/+8995
\| \|\ \ \
\| * \| \| \|	Component specs	Phil Hughes	2017-05-02	6	-6/+237
\| \| \| \| \|
\| * \| \| \|	Started specs [ci skip]	Phil Hughes	2017-05-02	3	-1/+166
\| \| \| \| \|
\| * \| \| \|	Fixed some spinach & rspec tests	Phil Hughes	2017-04-28	5	-13/+32
\| \| \| \| \|
\| * \| \| \|	Updated some Vue specific JS	Phil Hughes	2017-04-28	7	-16/+13
\| \| \| \| \|
\| * \| \| \|	Fixed public keys always rendering even when empty	Phil Hughes	2017-04-28	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Re-wrote to match our docs - still not 100% sure but closer than it was	Phil Hughes	2017-04-28	15	-115/+384
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' into deploy-keys-load-async	Phil Hughes	2017-04-28	117	-408/+2700
\| \|\ \ \ \
\| * \| \| \| \|	Add timeago	Jacob Schatz	2017-04-27	1	-2/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Add Vue with async deploy keys	Jacob Schatz	2017-04-27	3	-21/+107
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'origin/29667-deploy-keys' into ↵	Jacob Schatz	2017-04-27	8	-2/+148
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	deploy-keys-load-async
\| \| * \| \| \| \|	expose additional values in deploy key entity29667-deploy-keys	Jarka Kadlecova	2017-04-07	2	-0/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Project deploy keys json end point	Jarka Kadlecova	2017-03-24	8	-2/+144
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'bvl-reject-ee-namespace-names' into 'master'	Douwe Maan	2017-05-04	2	-0/+14
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reject EE reserved namespace paths in CE as well Closes #31800 See merge request !11095
\| * \| \| \| \| \| \|	Reject EE reserved namespace paths in CE as wellbvl-reject-ee-namespace-names	Bob Van Landuyt	2017-05-04	2	-0/+14
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '31824-move-bundler-audit-job-to-static-analysis-job' into ↵	Robert Speicher	2017-05-04	2	-12/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Include the bundler:audit job into the static-analysis job Closes #31824 See merge request !11092
\| * \| \| \| \| \| \| \|	Include the bundler:audit job into the static-analysis job31824-move-bundler-audit-job-to-static-analysis-job	Rémy Coutable	2017-05-04	2	-12/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'backport-ee-1800-add-enable-map-to-gfm-auto-complete' into ↵27070-rename-gitlab-slash-commands-to-quick-actions	Phil Hughes	2017-05-04	1	-67/+102
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add enableMap to gl.GfmAutoComplete for partial re-use -- EE backport See merge request !11073
\| * \| \| \| \| \| \| \|	Add enableMap to gl.GfmAutoComplete for partial re-usebackport-ee-1800-add-enable-map-to-gfm-auto-complete	Eric Eastwood	2017-05-03	1	-67/+102
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	EE backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1800
* \| \| \| \| \| \| \| \|	Merge branch '31760-add-tooltips-to-note-actions' into 'master'	Filipa Lacerda	2017-05-04	3	-6/+10
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tooltips to note action buttons Closes #31760 See merge request !11082
\| * \| \| \| \| \| \| \| \|	Add tooltips to note action buttons31760-add-tooltips-to-note-actions	Annabel Dunstone Gray	2017-05-03	3	-6/+10
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'dm-artifact-blob-viewer' into 'master'	Sean McGivern	2017-05-04	17	-139/+425
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use blob viewer for job artifacts Closes #31297 See merge request !11018
\| * \| \| \| \| \| \| \| \| \|	Add artifact file page that uses the blob viewerdm-artifact-blob-viewer	Douwe Maan	2017-05-04	17	-139/+425
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'tags-sort-default' into 'master'	Robert Speicher	2017-05-04	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed tags sort dropdown being empty Closes #31618 See merge request !11055
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/gb/document-serializers' into 'master'	Rémy Coutable	2017-05-04	1	-0/+325
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document serializers Closes #26758 See merge request !11059
\| * \| \| \| \| \| \| \| \| \|	Document serializers	Grzegorz Bizon	2017-05-04	1	-0/+325
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs/30141-improve-contributing-guide' into 'master'	Robert Speicher	2017-05-04	3	-112/+259
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Combine all GitLab workflow documentation to CONTRIBUTING.md" Closes #30141 See merge request !10991
\| * \| \| \| \| \| \| \| \| \|	Improving copy of CONTRIBUTING.md, PROCESS.md, and code_review.mddocs/30141-improve-contributing-guide	Rémy Coutable	2017-05-04	3	-17/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \| \|	Update ToC of CONTRIBUTING.md and PROCESS.md	Rémy Coutable	2017-05-03	2	-28/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \| \|	Improve the Code review guidelines documentation	Rémy Coutable	2017-05-03	2	-23/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \| \|	Improve the merge request guidelines and DoD in CONTRIBUTING.md	Rémy Coutable	2017-05-03	1	-11/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \| \|	Move retro/kickoff doc to PROCESS.md	Rémy Coutable	2017-05-03	2	-16/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \| \|	Document labels in CONTRIBUTING.md	Rémy Coutable	2017-05-02	2	-64/+183
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'tags-sort-default' into 'master'	Robert Speicher	2017-05-04	4	-9/+40
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed tags sort dropdown being empty Closes #31618 See merge request !11055
\| * \| \| \| \| \| \| \| \| \|	Moved to a view spectags-sort-default	Phil Hughes	2017-05-04	3	-15/+21
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fixed tags sort dropdown being empty	Phil Hughes	2017-05-03	4	-9/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #31618
* \| \| \| \| \| \| \| \| \| \|	Merge branch '30973-network-graph-sorted-by-date-and-topo' into 'master'	Douwe Maan	2017-05-04	4	-11/+33
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sort the network graph both by commit date and topographically Closes #30973 See merge request !11057
\| * \| \| \| \| \| \| \| \| \| \|	Sort the network graph both by commit date and topographically.30973-network-graph-sorted-by-date-and-topo	Timothy Andrew	2017-05-04	4	-11/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Previously, we sorted commits by date, which seemed to work okay. - The one edge case where this failed was when multiple commits have the same commit date (for example: when a range of commits are cherry picked with a single command, they all have the same commit date [and different author dates]). - Commits with the same commit date would be sorted arbitrarily, and usually break the network graph. - This commit solves the problem by both sorting by date, and by sorting topographically (parents aren't displayed until all their children are displayed) - Include review comments from @adamniedzielski A more detailed explanation is present here: https://gitlab.com/gitlab-org/gitlab-ce/issues/30973#note_28706230
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '31558-job-dropdown' into 'master'	Phil Hughes	2017-05-04	11	-214/+309
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pipeline table mini graph dropdown remains open when table is refreshed Closes #31558 and #31433 See merge request !11033