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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix notification message when admin label was modifiedfix-label-message	Robert Schilling	2017-09-18	1	-1/+1
\|
*	Merge branch 'docs-replace-pipelines-cicd' into 'master'	Achilleas Pipinellis	2017-09-18	6	-17/+17
\|\ \| \| \| \| \| \| \| \|	Change Pipelines to CI/CD for Settings page See merge request gitlab-org/gitlab-ce!14168
\| *	Merge branch 'master' into 'docs-replace-pipelines-cicd'	Achilleas Pipinellis	2017-09-18	384	-4667/+7147
\| \|\ \| \|/ \|/\| \| \|	# Conflicts: # doc/ci/variables/README.md
* \|	Merge branch 'rs-incoming-email-domain-docs' into 'security-10-0'	Robert Speicher	2017-09-17	1	-2/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Security Concerns section to reply by email documentation [ci skip] See merge request gitlab/gitlabhq!2191
* \|	Merge branch 'fix-sidebar-with-scrollbars' into 'master'	Annabel Dunstone Gray	2017-09-16	4	-9/+23
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed the new sidebars width when browser has scrollbars Closes #37606 See merge request gitlab-org/gitlab-ce!14191
\| * \|	Fixed the new sidebars width when browser has scrollbars	Phil Hughes	2017-09-16	4	-9/+23
\|/ /
* \|	Merge branch 'issue_37640' into 'master'	Grzegorz Bizon	2017-09-16	6	-6/+67
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project feature being deleted when updating project with invalid visibility level Closes #37640 See merge request gitlab-org/gitlab-ce!14234
\| * \	Merge branch 'master' into 'issue_37640'issue_37640	Felipe Artur	2017-09-15	310	-3656/+5781
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \|	Add data migration	Felipe Artur	2017-09-15	3	-2/+35
\| \| \| \|
\| * \| \|	Fix project feature being deleted when updating project with invalid ↵	Felipe Artur	2017-09-12	5	-5/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	visibility level
* \| \| \|	Merge branch 'rs-default-user-entity' into 'master'	Stan Hu	2017-09-16	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Ensure we use `Entities::User` for non-admin `users/:id` API requests See merge request gitlab-org/gitlab-ce!14314
\| * \| \|	Ensure we use `Entities::User` for non-admin `users/:id` API requests	Robert Speicher	2017-09-15	1	-1/+1
\|/ / /
* \| \|	Merge branch 'grpc-1.6' into 'master'	Robert Speicher	2017-09-15	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use grpc 1.6.0 See merge request gitlab-org/gitlab-ce!14262
\| * \| \|	Use grpc 1.6.0grpc-1.6	Jacob Vosmaer	2017-09-14	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'fix-share-with-group-lock-update' into 'master'	Robert Speicher	2017-09-15	4	-4/+51
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix setting share_with_group_lock Closes #37916 See merge request gitlab-org/gitlab-ce!14300
\| * \| \| \|	Fix setting share_with_group_lockfix-share-with-group-lock-update	Yorick Peterse	2017-09-15	4	-4/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior to this commit running Namespace#force_share_with_group_lock_on_descendants would result in updating _all_ namespaces in the namespaces table, not just the descendants. This is the result of ActiveRecord::Relation#update_all not taking into account the CTE. To work around this we use the CTE query as a sub-query instead of directly calling #update_all. To prevent this from happening the relations returned by Gitlab::GroupHierarchy are now marked as read-only, resulting in an error being raised when methods such as #update_all are used. Fortunately on GitLab.com our statement timeouts appear to have prevented this query from actually doing any damage other than causing a very large amount of dead tuples. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37916
* \| \| \| \|	Merge branch '35917_create_services_for_keys' into 'master'	Rémy Coutable	2017-09-15	18	-49/+103
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	created services for keys See merge request gitlab-org/gitlab-ce!13331
\| * \| \| \| \|	created services for keys	haseeb	2017-09-15	18	-49/+103
\|/ / / / /
* \| \| \| \|	Merge branch '21331-improve-confusing-compare-page' into 'master'	Phil Hughes	2017-09-15	5	-17/+28
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the labels in the Compare form less confusing Closes #21331 See merge request gitlab-org/gitlab-ce!14225
\| * \| \| \| \|	Make the labels in the Compare form less confusing21331-improve-confusing-compare-page	Rémy Coutable	2017-09-15	5	-17/+28
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Improve the descriptive text * Rename "from" to "Target" and "to" to "Source" * Swap "Target" and "Source" to have the same order as in MRs * Reworded "Switch base of comparison" to "Swap versions" Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'projects-controller-show' into 'master'	Rémy Coutable	2017-09-15	7	-16/+121
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SQL performance improvements for ProjectsController#show See merge request gitlab-org/gitlab-ce!14226
\| * \| \| \| \|	Memoize the latest builds of a pipelineprojects-controller-show	Yorick Peterse	2017-09-14	4	-15/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures that if a pipeline is present for the last commit on a project's homepage we only run 1 query to get the builds, instead of running 2 queries. See https://gitlab.com/gitlab-org/gitlab-ce/issues/36878#note_40073339 for more information.
\| * \| \| \| \|	Memoize pipelines for project download buttons	Yorick Peterse	2017-09-14	4	-1/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds Project#latest_successful_pipeline_for and Project#latest_successful_pipeline_for_default_branch. The 2nd method memoizes the result (taking nil values into account) to ensure the underlying query isn't executed multiple times when viewing a project's homepage. See https://gitlab.com/gitlab-org/gitlab-ce/issues/36878#note_40073607 for more information.
* \| \| \| \| \|	Merge branch 'winh-protected-branch-modal-merged' into 'master'36436-repo-button-back-button-not-consistent	Phil Hughes	2017-09-15	4	-5/+20
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display whether branch has been merged when deleting protected branch Closes #32295 See merge request gitlab-org/gitlab-ce!14220
\| * \| \| \| \|	Display whether branch has been merged when deleting protected branch	Winnie Hellmann	2017-09-15	4	-5/+20
\|/ / / / /
* \| \| \| \|	Merge branch 'revert-sidebar-title-attribute' into 'master'	Filipa Lacerda	2017-09-15	7	-48/+39
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove title attribute from sidebar elements See merge request gitlab-org/gitlab-ce!14140
\| * \| \| \| \|	fixed merge request specrevert-sidebar-title-attribute	Phil Hughes	2017-09-13	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Remove title attribute from sidebar elements	Phil Hughes	2017-09-13	6	-47/+38
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs/environment-vars-clarify' into 'master'	Rémy Coutable	2017-09-15	3	-57/+69
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify what variables can be used under `environment:` See merge request gitlab-org/gitlab-ce!14277
\| * \| \| \| \| \|	Clarify what variables can be used under `environment:`docs/environment-vars-clarify	Achilleas Pipinellis	2017-09-14	3	-57/+69
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '20824-scope-users-to-members-in-group-issuable-list' into 'master'	Phil Hughes	2017-09-15	7	-2/+57
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Scope users by group inside dropdowns if I'm on group page (Issue, MRs)" Closes #20824 See merge request gitlab-org/gitlab-ce!14249
\| * \| \| \| \| \| \|	Return only group's members in user dropdowns on issuables list pages20824-scope-users-to-members-in-group-issuable-list	Rémy Coutable	2017-09-14	6	-0/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	Scope users by group in issuable search bar	barthc	2017-09-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch '37844-layout-nav-space' into 'master'	Phil Hughes	2017-09-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove extra space between profile header and navbar Closes #37844 See merge request gitlab-org/gitlab-ce!14275
\| * \| \| \| \| \| \| \|	Remove extra space between profile header and navbar37844-layout-nav-space	Annabel Dunstone Gray	2017-09-14	1	-1/+1
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '37886-typo-in-protected-runners-setting-checkbox' into 'master'	Grzegorz Bizon	2017-09-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Typo in Protected Runners setting checkbox" Closes #37886 See merge request gitlab-org/gitlab-ce!14284
\| * \| \| \| \| \| \| \|	Fix typo37886-typo-in-protected-runners-setting-checkbox	Fabio Busatto	2017-09-14	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'patch-26' into 'master'	Stan Hu	2017-09-15	1	-1/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add info about UX label to feature proposal to CONTRIBUTING.md See merge request gitlab-org/gitlab-ce!14281
\| * \| \| \| \| \| \| \| \|	add info about UX label to feature proposal to CONTRIBUTING.md	Sarrah Vesselov	2017-09-14	1	-1/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '37896-minor-improvements-to-prometheus-docs' into 'master'	Achilleas Pipinellis	2017-09-15	2	-3/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor improvements to prometheus docs Closes #37896 See merge request gitlab-org/gitlab-ce!14288
\| * \| \| \| \| \| \| \| \|	update screenshot37896-minor-improvements-to-prometheus-docs	Joshua Lambert	2017-09-15	1	-0/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fix minor typo	Joshua Lambert	2017-09-15	1	-3/+2
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'indexes-for-recent-push-events' into 'master'	Robert Speicher	2017-09-14	2	-2/+42
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing index for getting recent push events See merge request gitlab-org/gitlab-ce!14273
\| * \| \| \| \| \| \| \| \|	Add missing index for getting recent push eventsindexes-for-recent-push-events	Yorick Peterse	2017-09-14	2	-2/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This index is required to allow fast retrieval of recent push events without merge requests. Without this index in place the query would lead to PostgreSQL scanning over 150 000 index entries all the time, easily taking up between 200 and 500 milliseconds. This index reduces the time spent in this process to around 40 milliseconds on GitLab.com.
* \| \| \| \| \| \| \| \| \|	Merge branch 'changes-overflow-fix' into 'master'	Annabel Dunstone Gray	2017-09-14	2	-3/+11
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed overflow issue in changes dropdown See merge request gitlab-org/gitlab-ce!14181
\| * \| \| \| \| \| \| \| \|	Fixed overflow issue in changes dropdownchanges-overflow-fix	Phil Hughes	2017-09-13	2	-3/+11
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '37872-fix-nasty-gdk-nuke' into 'master'	Robert Speicher	2017-09-14	2	-37/+51
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "`bin/rspec`/`bin/karma` can nuke the GDK entirely" Closes #37872 See merge request gitlab-org/gitlab-ce!14276
\| * \| \| \| \| \| \| \|	Make TestInit.setup_gitlab_shell and TestInit.setup_gitaly more robust37872-fix-nasty-gdk-nuke	Rémy Coutable	2017-09-14	1	-36/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Abort when `TestEnv.init` is not called in the `test` environment	Rémy Coutable	2017-09-14	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Force `RAILS_ENV` to `test` in `spec/spec_helper.rb`	Rémy Coutable	2017-09-14	1	-1/+1
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>