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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update UX guidewinh-unify-modals	Winnie Hellmann	2017-12-12	2	-14/+16
\|
*	Rename recaptcha-dialog to recaptcha-modal	Winnie Hellmann	2017-12-12	7	-18/+18
\|
*	Rename popup-dialog to modal	Winnie Hellmann	2017-12-12	14	-67/+61
\|
*	Merge branch 'fix_js_style_guide_markup' into 'master'	Rémy Coutable	2017-12-11	1	-62/+60
\|\ \| \| \| \| \| \| \| \|	fixes some markup issues in the js style guide docs See merge request gitlab-org/gitlab-ce!15828
\| *	fixes some markup issues in the js style guide docs	Christiaan Van den Poel	2017-12-11	1	-62/+60
\|/
*	Merge branch 'url-utility-es-module' into 'master'	Filipa Lacerda	2017-12-11	50	-188/+188
\|\ \| \| \| \| \| \| \| \|	Moved URL utility methods into exported es modules See merge request gitlab-org/gitlab-ce!15783
\| *	updated importsurl-utility-es-module	Phil Hughes	2017-12-11	14	-29/+29
\| \|
\| *	Merge branch 'master' into 'url-utility-es-module'	Phil Hughes	2017-12-11	143	-1094/+2820
\| \|\ \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/issue_show/components/app.vue
\| * \|	fix missed gl.utils.visitUrl spy	Phil Hughes	2017-12-08	1	-2/+2
\| \| \|
\| * \|	fixed URL being undefined :face_palm:	Phil Hughes	2017-12-08	1	-2/+2
\| \| \|
\| * \|	remove utl util imports from boards specs	Phil Hughes	2017-12-08	3	-3/+0
\| \| \|
\| * \|	use exported methods instead of gl.utils	Phil Hughes	2017-12-08	47	-126/+140
\| \| \|
\| * \|	Moved URL utility methods into es modules	Phil Hughes	2017-12-08	1	-69/+58
\| \| \|
* \| \|	Merge branch '35724-animate-sidebar' into 'master'	Filipa Lacerda	2017-12-11	12	-33/+43
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Animate contextual sidebar; change class names for easier readability Closes #35724 See merge request gitlab-org/gitlab-ce!15797
\| * \| \|	Fix transitions35724-animate-sidebar	Annabel Dunstone Gray	2017-12-07	1	-12/+9
\| \| \| \|
\| * \| \|	Fix mobile styles	Annabel Dunstone Gray	2017-12-07	2	-18/+10
\| \| \| \|
\| * \| \|	Add changelog	Annabel Dunstone Gray	2017-12-07	1	-0/+5
\| \| \| \|
\| * \| \|	Animate contextual sidebar; change class names for easier readability	Annabel Dunstone Gray	2017-12-07	12	-35/+51
\| \| \| \|
* \| \| \|	Merge branch 'docs-add-index-to-operations' into 'master'	Achilleas Pipinellis	2017-12-11	4	-9/+19
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: add index for `doc/administration/operations/` See merge request gitlab-org/gitlab-ce!15852
\| * \| \| \|	add index for doc/administration/operations/docs-add-index-to-operations	Marcia Ramos	2017-12-11	4	-9/+19
\| \| \| \| \|
* \| \| \| \|	Merge branch 'add-remove-column-cop' into 'master'	Rémy Coutable	2017-12-11	17	-0/+118
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add cop for use of remove_column See merge request gitlab-org/gitlab-ce!15855
\| * \| \| \| \|	Add cop for use of remove_columnadd-remove-column-cop	Sean McGivern	2017-12-11	17	-0/+118
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove_column should only be used in the up (or change) step of a migration if it's a post-deployment migration. Otherwise there will be downtime due to the ActiveRecord column cache, which we can avoid by using the IgnorableColumn concern in combination with a post-deployment migration.
* \| \| \| \| \|	Merge branch 'bw-fix-key-count-service-spec' into 'master'ch-test-me	Nick Thomas	2017-12-11	1	-6/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	small change to make less conflict with EE version See merge request gitlab-org/gitlab-ce!15809
\| * \| \| \| \| \|	small change to make less conflict with EE version	Brett Walker	2017-12-11	1	-6/+4
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'winh-merge-dev-docs' into 'master'	Winnie Hellmann	2017-12-11	1	-2/+24
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve merge conflicts with dev.gitlab.org/master after security release See merge request gitlab-org/gitlab-ce!15851
\| * \| \| \| \| \|	Resolve merge conflicts with dev.gitlab.org/master after security release	Winnie Hellmann	2017-12-11	1	-2/+24
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'sh-remove-allocation-tracking-influxdb' into 'master'	Yorick Peterse	2017-12-11	5	-97/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove allocation tracking code from InfluxDB sampler for performance Closes gitlab-com/infrastructure#3250 See merge request gitlab-org/gitlab-ce!15834
\| * \| \| \| \| \|	Remove RubySampler#sample_objects for performance as well	Stan Hu	2017-12-11	2	-50/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove allocation tracking code from InfluxDB sampler for performancesh-remove-allocation-tracking-influxdb	Stan Hu	2017-12-10	3	-47/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On GitLab.com, InfluxSampler#sample_objects appears to take 1.2 s or so to iterate through 1059 objects. This had led to delays of a couple hundred milliseconds in processing in the main thread. Remove this code since it's not really being used. Closes gitlab-com/infrastructure#3250
* \| \| \| \| \| \|	Merge branch 'remove_assignee_id' into 'master'	Yorick Peterse	2017-12-11	6	-4/+90
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove issues.assignee_id column Closes #30453 See merge request gitlab-org/gitlab-ce!11637
\| * \| \| \| \| \| \|	Add spec for removing issues.assignee_id	Sean McGivern	2017-12-11	3	-1/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This migration also needs to be a post-deployment migration, as it removes a column.
\| * \| \| \| \| \| \|	Improve down step of removing issues.assignee_id column	Sean McGivern	2017-12-11	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using update_column_in_batches means that we can chunk the updates.
\| * \| \| \| \| \| \|	Fix specs after removing assignee_id field	Valery Sizov	2017-12-11	3	-2/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove issues.assignee_id column	Valery Sizov	2017-12-11	2	-2/+36
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2017-12-11	5	-2/+46
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40743-bug-accepting-new-group-members-when-permission-level-developer' into 'master' Bugfix: User can't change the access level of an access requester Closes #40743 See merge request gitlab-org/gitlab-ce!15832
\| * \| \| \| \| \| \| \|	Bugfix: User can't change the access level of an access requester	Rubén Dávila	2017-12-11	5	-2/+46
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The endpoint was returning 404 because it was only searching on the current members of a Group or Project and not the access requesters.
* \| \| \| \| \| \| \|	Merge branch 'sh-bump-prometheus-gem-properly' into 'master'	Robert Speicher	2017-12-11	2	-2/+2
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly bump prometheus-client-mmap gem versions See merge request gitlab-org/gitlab-ce!15825
\| * \| \| \| \| \| \|	Properly bump prometheus-client-mmap gem versionssh-bump-prometheus-gem-properly	Stan Hu	2017-12-09	2	-2/+2
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only the Gemfile.lock was updated before.
* \| \| \| \| \| \|	Merge branch 'docs/fix-header-level' into 'master'	Achilleas Pipinellis	2017-12-11	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove a header level in the new 'Automatic CE->EE merge' doc See merge request gitlab-org/gitlab-ce!15843
\| * \| \| \| \| \| \|	Remove a header level in the new 'Automatic CE->EE merge' doc	Rémy Coutable	2017-12-11	1	-1/+1
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'bvl-circuitbreaker-metrics' into 'master'	Douwe Maan	2017-12-11	2	-2/+25
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Keep track of the circuit breaker access check timings Closes #39698 See merge request gitlab-org/gitlab-ce!15612
\| * \| \| \| \| \| \|	Keep track of storage check timings	Bob Van Landuyt	2017-12-11	2	-2/+25
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'qa/gb/improve-multi-project-pipeline-omnibus-script' into 'master'	Grzegorz Bizon	2017-12-11	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not raise when downstream pipeline is created Closes #40987 See merge request gitlab-org/gitlab-ce!15837
\| * \| \| \| \| \|	Do not raise when downstream pipeline is createdqa/gb/improve-multi-project-pipeline-omnibus-script	Grzegorz Bizon	2017-12-11	1	-1/+1
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'	Winnie Hellmann	2017-12-11	14	-46/+231
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pick 10.2.4 security fixes into master See merge request gitlab-org/gitlab-ce!15821
\| * \| \| \| \|	Resolve conflicts in app/models/user.rbmk-pick-10-2-4-security-fixes	Douwe Maan	2017-12-11	1	-27/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Manually add 10.2.4 changelog entries	Michael Kozono	2017-12-08	4	-15/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'note-preview' into 'security-10-2'	Fatih Acet	2017-12-08	2	-1/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	prevent potential XSS when editing comment See merge request gitlab/gitlabhq!2238 (cherry picked from commit 80ed6d25a46c0f70ec8baea78b5777118d63876c) 7480e462 prevent potential XSS when editing comment
\| * \| \| \| \|	Merge branch 'issue_30663' into 'security-10-2'	Sean McGivern	2017-12-08	3	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent creating issues through API without having permissions See merge request gitlab/gitlabhq!2225 (cherry picked from commit c298bbaa88883343dc9cbbb6abec0808fb3b546c) 915b97c5 Prevent creating issues through API without having permissions
\| * \| \| \| \|	Merge branch 'rs-security-group-api' into 'security-10-2'	Douwe Maan	2017-12-08	3	-2/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[10.2] Ensure we expose group projects using GroupProjectsFinder See merge request gitlab/gitlabhq!2234 (cherry picked from commit 072f8f2fd6ec794645375a16ca4ddc1cbeb76d7a) a2240338 Ensure we expose group projects using GroupProjectsFinder