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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove tooltips and titles from label subscription buttonsremove-subscribe-label-tooltip	Annabel Dunstone Gray	2017-03-03	2	-2/+6
\|
*	Merge branch '19497-hide-relevant-info-when-project-issues-are-disabled' ↵	Sean McGivern	2017-03-03	5	-25/+106
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Hide issue info when project issues are disabled Closes #19497 See merge request !9083
\| *	Hide issue info when project issues are disabled	George Andrinopoulos	2017-03-02	5	-25/+106
\| \|
* \|	Merge branch '3440-remove-hsts-header-from-rails-app' into 'master' 13251-docs-on-search	Marin Jankovski	2017-03-03	4	-4/+31
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Stop setting Strict-Transport-Securty header from within the app See merge request !9341
\| * \|	Stop setting Strict-Transport-Securty header from within the app	Paweł Chojnacki	2017-03-03	4	-4/+31
\|/ /
* \|	Merge branch 'ee-comp-mr-2' into 'master'	Sean McGivern	2017-03-03	1	-1/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Improve EE compatibility MR docs [ci skip] See merge request !9681
\| * \|	Improve EE compatibility MR docs [ci skip] ee-comp-mr-2	Adam Niedzielski	2017-03-03	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \|	EE MR should be updated before CE MR is merged. Suggest using "git rerere".
* \| \|	Merge branch 'rs-dev-seed-time' into 'master'	Sean McGivern	2017-03-03	2	-12/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the `Gitlab::Seeder` monkey patch to disable mail delivery Closes #27609 See merge request !9678
\| * \| \|	Fix the `Gitlab::Seeder` monkey patch to disable mail deliveryrs-dev-seed-time	Robert Speicher	2017-03-02	2	-12/+11
\| \| \| \|
* \| \| \|	Merge branch 'tooltip-hide-on-scroll' into 'master'	Filipa Lacerda	2017-03-03	2	-0/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hides the tooltip on scroll See merge request !9653
\| * \| \| \|	Hides the tooltip on scrolltooltip-hide-on-scroll	Phil Hughes	2017-03-02	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is especially obvious on mobile. The tooltip opens on tap but there is no way to hide it, so this hides the tooltip after scrolling.
* \| \| \| \|	Merge branch 'fix/gb/fix-build-retry-tags-assignment' into 'master'	Kamil Trzciński	2017-03-03	3	-25/+53
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix runner tags assignment when retrying a job Closes #28846 See merge request !9612
\| * \| \| \|	Fix Rubocop offense in build retry servicefix/gb/fix-build-retry-tags-assignment	Grzegorz Bizon	2017-03-02	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Move unused consts from retry build service to specs	Grzegorz Bizon	2017-03-02	2	-23/+22
\| \| \| \| \|
\| * \| \| \|	Improve build retry service tests for cloning data	Grzegorz Bizon	2017-03-01	2	-2/+13
\| \| \| \| \|
\| * \| \| \|	Fix runner tags assignment when retrying a job	Grzegorz Bizon	2017-03-01	3	-23/+41
\| \| \| \| \|
* \| \| \| \|	Merge branch '27532_api_changes' into 'master'	Sean McGivern	2017-03-03	8	-17/+317
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use iids as filter parameter Closes #27532 See merge request !9096
\| * \| \| \| \|	Use iids as filter parameter	Jarka Kadlecova	2017-03-02	8	-17/+317
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '28935-make-logo-smaller' into 'master'	Alfredo Sumaran	2017-03-03	3	-4/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Decrease tanuki logo size Closes #28935 See merge request !9676
\| * \| \| \| \| \|	Decrease tanuki logo size	Annabel Dunstone Gray	2017-03-02	3	-4/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '28010-mr-merge-button-default-to-danger' into 'master'	Alfredo Sumaran	2017-03-03	9	-35/+122
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Default to dangerous MR merge button Closes #28010 See merge request !9245
\| * \| \| \| \| \| \|	Default to subtle MR mege button until CI status is available28010-mr-merge-button-default-to-danger	Eric Eastwood	2017-03-02	9	-35/+122
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9245
* \| \| \| \| \| \| \|	Merge branch 'remove_group_policy_add_rules' into 'master'	Douwe Maan	2017-03-02	1	-6/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove now unnecessary `additional_rules!` method from GroupPolicy See merge request !9595
\| * \| \| \| \| \| \| \|	Remove now unnecessary `additional_rules!` method from GroupPolicy	Drew Blessing	2017-02-28	1	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The intention was for this to be used to override group policy in EE. This led to all sort of strange problems in practice - for example, https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1025 needed to override `owner` permissions, but `additional_rules!` passed `master` only. The better solution is to use an EE module to override the policy. Removing this now defunct method.
* \| \| \| \| \| \| \| \|	Merge branch 'dm-fix-api-create-file-on-empty-repo' into 'master'	Robert Speicher	2017-03-02	8	-46/+52
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix creating a file in an empty repo using the API Closes #28626 See merge request !9632
\| * \| \| \| \| \| \| \| \|	Delete hooks from project with empty repositorydm-fix-api-create-file-on-empty-repo	Douwe Maan	2017-03-02	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Don't require start branch to exist if we're just creating a new branch	Douwe Maan	2017-03-02	1	-11/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix spec	Douwe Maan	2017-03-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix variable name and change copy	Douwe Maan	2017-03-01	2	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix creating a file in an empty repo using the API	Douwe Maan	2017-03-01	7	-44/+50
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '27978-improve-task-list-ux' into 'master'	Clement Ho	2017-03-02	3	-4/+78
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only add a newline in Markdown Editor if the current line is not empty Closes #27978 See merge request !9455
\| * \| \| \| \| \| \| \| \| \|	Only add a newline in Markdown Editor if the current line is not empty	Jan Christophersen	2017-03-02	3	-4/+78
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'add-svg-loader' into 'master'	Fatih Acet	2017-03-02	37	-306/+156
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes Tech debt: No need to pass svgs as props into Vue with Webpack Closes #27692 and #27840 See merge request !9522
\| * \| \| \| \| \| \| \| \| \| \|	Changes after reviewadd-svg-loader	Filipa Lacerda	2017-03-02	4	-6/+21
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into add-svg-loader	Filipa Lacerda	2017-02-28	149	-710/+2008
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (21 commits) Move `Group -> Members` to top-level, fix missing sub-nav for Subgroups Left align logo; increase max width of title Add newline to end of frontend.md. Clone nested objects from default data. Checks if key is present before accessing it Update CHANGELOG.md for 8.17.1 Document use of AirBnb js styleguide and eslint. Don't allow a project to be shared with an ancestor of the group it is in Fix access to projects shared with a nested group Ignore builds dir when run rubocop check Remove hidden-xs classes from last columns in environments and pipelines table. Transform pipelines table css to match structure of pipelines table Make environments table overflow Use exceptions for MergeService error handling Clarify when to create EE compatibility MR in code review process New runner API returns 204 Backport new behavior to CI API Backport API to V3 Update documentation Return 204 for delete endpoints API project create: Make name or path required Only create unmergeable todos once Put back the new project button ...
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into add-svg-loader	Filipa Lacerda	2017-02-28	44	-187/+508
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Fix migration without DOWNTIME clause specified Fix CSS classes fix missing @ symbol Update CHANGELOG.md for 8.16.7 Update CHANGELOG.md for 8.16.7 Update CHANGELOG.md for 8.16.7 Make RuboCop happy Add development fixtures for nested groups Align last column buttons with new environment button Removed jQuery UI draggable ensure webpack dev server proxy connects regardless of request headers Keep consistent in handling indexOf results Replace setInterval with setTimeout to prevent highly frequent requests Add feature specs for three types of user uploads Minor refactoring of Uploaders Fix #27840 - Improve the search bar experience on mobile Fix false positive caused by non-interpolated string use Fix inline comment images by removing wrapper #20890
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into 'add-svg-loader'	Filipa Lacerda	2017-02-27	85	-479/+1105
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes after review - adds alias for icons path	Filipa Lacerda	2017-02-27	8	-23/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix eslint error	Filipa Lacerda	2017-02-25	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused test	Filipa Lacerda	2017-02-25	1	-30/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into 'add-svg-loader'	Filipa Lacerda	2017-02-25	49	-834/+931
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unneed code	Filipa Lacerda	2017-02-25	1	-13/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove tech debt code	Filipa Lacerda	2017-02-25	8	-77/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load svgs in cycle analytics	Filipa Lacerda	2017-02-25	9	-21/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use vhtml only when necessary	Filipa Lacerda	2017-02-25	4	-7/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load SVGs into Pipelines	Filipa Lacerda	2017-02-25	8	-92/+81
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Loads SVGs into JS for environments	Filipa Lacerda	2017-02-24	7	-60/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds loader to load SVG	Filipa Lacerda	2017-02-24	3	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '28410-dropdown-styling' into 'master'	Alfredo Sumaran	2017-03-02	3	-2/+16
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "missing count badge styling in new sidebar dropdown" Closes #28410 See merge request !9592
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "missing count badge styling in new sidebar dropdown"	Annabel Dunstone Gray	2017-03-02	3	-2/+16
\|/ / / / / / / / / / / / / / /