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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Refactored Sidekiq Throttler and updated documentationsidekiq-job-throttling	Patricio Cano	2016-11-11	6	-23/+20
\|
*	Refactored initializer code to its own class and added tests	Patricio Cano	2016-11-10	3	-7/+56
\|
*	Added documentation and CHANGELOG item.	Patricio Cano	2016-11-10	4	-0/+37
\|
*	Allow the Sidekiq queues to throttle and the factor by which to throttle ↵	Patricio Cano	2016-11-10	8	-13/+41
\| \| \| \|	them to be configurable
*	Allow certain Sidekiq jobs to be throttled	Patricio Cano	2016-11-10	9	-0/+66
\|
*	Merge branch 'hide-graph-btn' into 'master'	Fatih Acet	2016-11-10	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Make toggle pipeline btn into button element Toggle pipeline graph button was a `div` instead of a `button` :frowning2: See merge request !7404
\| *	Make toggle pipeline btn into button element	Annabel Dunstone Gray	2016-11-10	1	-1/+1
\|/
*	Merge branch 'grapify-token-api' into 'master'	Rémy Coutable	2016-11-10	2	-47/+31
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify triggers API ## What are the relevant issue numbers? Related to #22928 See merge request !7378
\| *	Grapify token API	Robert Schilling	2016-11-10	2	-47/+31
\| \|
* \|	Merge branch 'fix/error-when-invalid-branch-for-new-pipeline-used' into ↵	Douwe Maan	2016-11-10	4	-7/+62
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix error when using invalid branch name when creating a new pipeline ## What does this MR do? This MR fixes `500` error when creating a new pipeline though user interface ("Run pipeline") ## Are there points in the code the reviewer needs to double check? Is this a good approach to catch those exceptions on `Repository` level? ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug ## What are the relevant issue numbers? Closes #23982 See merge request !7324
\| * \|	Remove redundant rescue from repository keep_aroundfix/error-when-invalid-branch-for-new-pipeline-used	Grzegorz Bizon	2016-11-09	1	-5/+1
\| \| \|
\| * \|	Remove redundant space from repository model code	Grzegorz Bizon	2016-11-09	1	-1/+1
\| \| \|
\| * \|	Add Changelog entry for new pipeline fix	Grzegorz Bizon	2016-11-07	1	-0/+4
\| \| \|
\| * \|	Evade some exceptions when using invalid references	Grzegorz Bizon	2016-11-07	2	-1/+54
\| \| \|
\| * \|	Improve code readability in pipelines controller	Grzegorz Bizon	2016-11-07	1	-1/+3
\| \| \|
* \| \|	Merge branch 'fix-cache-for-commit-status' into 'master'	Rémy Coutable	2016-11-10	2	-1/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix cache for commit status in commits list to respect branches Fix cache for commit status in commits list to respect branches Closes #24324 See merge request !7372
\| * \| \|	Fix cache for commit status in commits list to respect branches	Lin Jen-Shin	2016-11-10	2	-1/+5
\| \| \| \|
* \| \| \|	Merge branch 'forking-in-progress-title' into 'master'	Sean McGivern	2016-11-10	2	-1/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use 'Forking in progress' title when appropriate See merge request !7394
\| * \| \| \|	Use 'Forking in progress' title when appropriate	Philip Karpiak	2016-11-09	2	-1/+5
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch '23945-improve-ee_compat_check-task-part-3' into 'master'	Robert Speicher	2016-11-10	3	-83/+110
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Improve ee_compat_check task (part 3)" Improve the `ee_compat_check` task with caching and keep artifacts on failure. Closes #23945. See merge request !7177
\| * \| \| \|	Improve EeCompatCheck, cache EE repo and keep artifacts for the ↵23945-improve-ee_compat_check-task-part-3	Rémy Coutable	2016-11-10	3	-83/+110
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ee_compat_check task Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch '23502-import-university-training-preso-slides' into 'master'	Achilleas Pipinellis	2016-11-10	27	-0/+1383
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Import University training preso slides ## What does this MR do? Adds missing training material from University. ## What are the relevant issue numbers? Closes #23502 See merge request !7016
\| * \| \| \|	Added training material23502-import-university-training-preso-slides	Sean Packham	2016-10-20	27	-0/+1383
\| \| \| \| \|
* \| \| \| \|	Merge branch 'grapify-milestone-api' into 'master'	Rémy Coutable	2016-11-10	2	-54/+66
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify milestones API ## What are the relevant issue numbers? Related to #22928 See merge request !7373
\| * \| \| \|	Grapify milestones APIgrapify-milestone-api	Robert Schilling	2016-11-10	2	-54/+66
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'grapify-runners-api' into 'master'	Rémy Coutable	2016-11-10	2	-55/+66
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify runners API ## What are the relevant issue numbers? Related to #22928 See merge request !7377
\| * \| \| \|	Grapify runners API	Robert Schilling	2016-11-10	2	-55/+66
\| \|/ / /
* \| \| \|	Merge branch 'grapify-session-api' into 'master'	Rémy Coutable	2016-11-10	2	-17/+18
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify the session API ## What are the relevant issue numbers? Related to #22928 See merge request !7381
\| * \| \| \|	Grapify the session APIgrapify-session-api	Robert Schilling	2016-11-09	2	-17/+18
\| \|/ / /
* \| \| \|	Merge branch 'feature/api_owned_resource' into 'master'	Sean McGivern	2016-11-10	5	-0/+65
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Add api endpoint `/groups/owned` See merge request !7103
\| * \| \|	Added API endpoint groups/owned	Borja Aparicio	2016-11-08	4	-0/+41
\| \| \| \|
\| * \| \|	Added API spec test for projects/owned endpoint	Borja Aparicio	2016-11-08	1	-0/+24
\| \| \| \|
* \| \| \|	Fix CHANGELOG after 8.14.0-rc1 tag	Alejandro Rodríguez	2016-11-09	1	-3/+0
\| \| \| \|
* \| \| \|	Update CHANGELOG.md for 8.14.0-rc1	Alejandro Rodríguez	2016-11-09	32	-126/+34
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Fix YAML syntax on CHANGELOG entry	Alejandro Rodríguez	2016-11-09	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch '24341-fix-failure' into 'master'	Stan Hu	2016-11-09	2	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove order-dependent expectation Fixes #24341, hopefully See merge request !7385
\| * \| \| \|	Remove order-dependent expectation24341-fix-failure	Rémy Coutable	2016-11-09	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'rs-doc-highlighting' into 'master'	Achilleas Pipinellis	2016-11-09	3	-15/+15
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add more highlighting to development docs Now that docs.gitlab.com has lovely highlighting, we should make sure we use it everywhere it makes sense! See merge request !7369
\| * \| \| \|	Add more highlighting to Shell Commands docrs-doc-highlighting	Robert Speicher	2016-11-09	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Add more highlighting to Instrumentation doc	Robert Speicher	2016-11-09	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Add more highlighting to Migration Style Guide doc	Robert Speicher	2016-11-09	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch '23731-add-param-to-user-api' into 'master'	Sean McGivern	2016-11-09	4	-1/+45
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add query param to filter users by 'external' & 'blocked' type on API Closes #23731 See merge request !7109
\| * \| \| \| \|	Add query param to filter users on 'external' & 'blocked' type on API	Yatish Mehta	2016-11-08	4	-1/+45
\| \| \| \| \| \|
* \| \| \| \| \|	Merge remote-tracking branch 'dev/master'	Robert Speicher	2016-11-09	1	-5/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Minor CHANGELOG.md cleanups	Robert Speicher	2016-11-09	1	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge branch 'docs/add-git-cheatsheet' into 'master'	Achilleas Pipinellis	2016-11-09	1	-0/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a link to Git cheatsheet PDF in docs readme See merge request !7382
\| * \| \| \| \| \|	Add a link to Git cheatsheet PDF in docs readme	Achilleas Pipinellis	2016-11-09	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge branch '22058-auto-selection' into 'master'	Fatih Acet	2016-11-09	2	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change auto selection behaviour of emoji and slash commands to be more UX/Type friendly ## What does this MR do? In the context of a special command (starting with "/", ":", ...), the MR disables auto selection of first item in the dropdown suggestion menu, until at least a character has been typed. This behavior change originated from #22058 and #23578 in which problems with the ":" special command were pointed out. ## Are there points in the code the reviewer needs to double check? At lines +187 and +242 there were originally no sorters. Given what ``DefaultOptions.sorter`` does, I don't think it is a problem. ## Why was this MR needed? To solve #22058 and #23578 ## Does this MR meet the acceptance criteria? - [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [X] All builds are passing - [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [X] Branch has no merge conflicts with `master` (if it does - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22058 and #23578 See merge request !7129
\| * \| \| \| \| \| \|	Fixes #22058 and #23578	Yann Gravrand	2016-11-06	2	-0/+5
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'ldap_check_bind' into 'master'	Sean McGivern	2016-11-09	9	-78/+226
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve ldap:check errors Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21621. See merge request !6601