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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Bring back branches badge to main project pagehighest-return-on-diff-investment	Adam Niedzielski	2017-06-29	2	-1/+5
\|
*	Merge branch 'postreceive-gl-repository' into 'master'	Sean McGivern	2017-06-29	2	-43/+16
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Use gl_repository exclusively on PostReceive Closes gitaly#201 See merge request !12290
\| *	Use gl_repository exclusively as identifier on post-receivepostreceive-gl-repository	Alejandro Rodríguez	2017-06-27	2	-43/+16
\| \|
* \|	Merge branch 'feature/sm/34314-add-hasvariable-concern' into 'master'	Kamil Trzciński	2017-06-29	4	-56/+69
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement `HasVariable` concern Closes #34314 See merge request !12448
\| * \|	Improve small thingsfeature/sm/34314-add-hasvariable-concern	Shinya Maeda	2017-06-28	2	-4/+2
\| \| \|
\| * \|	Remove PoC spec	Shinya Maeda	2017-06-28	1	-34/+0
\| \| \|
\| * \|	Add a test for checking validates :key does not override by concern	Shinya Maeda	2017-06-28	1	-0/+34
\| \| \|
\| * \|	Decuplin	Shinya Maeda	2017-06-28	4	-56/+71
\| \| \|
* \| \|	Merge branch 'docs/pat-expiration-date' into 'master'	Marcia Ramos	2017-06-29	1	-0/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify the expiration date of PATs See merge request !12339
\| * \| \|	Clarify the expiration date of PATsdocs/pat-expiration-date	Achilleas Pipinellis	2017-06-21	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/22566#note_32336497 [ci skip]
* \| \| \|	Merge branch '30708-stop-using-deleted-at-to-filter-namespaces' into 'master'	Douwe Maan	2017-06-29	15	-40/+23
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	refactors Project#search namespace join Closes #30708 See merge request !12091
\| * \| \| \|	Removes redundant pending delete checks30708-stop-using-deleted-at-to-filter-namespaces	Tiago Botelho	2017-06-28	6	-27/+10
\| \| \| \| \|
\| * \| \| \|	Fix current feature related specs	Tiago Botelho	2017-06-28	11	-21/+21
\| \| \| \| \|
\| * \| \| \|	Removes pending delete from filter scopes	Tiago Botelho	2017-06-28	4	-7/+6
\| \| \| \| \|
\| * \| \| \|	refactors Project#search namespace join	Tiago Botelho	2017-06-28	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'	Robert Speicher	2017-06-28	5	-4/+52
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Drop default ORDER scope when calling a find method on a Sortable model Closes #23079 and #34412 See merge request !12499
\| * \| \| \| \|	Make changelog more descriptivedm-drop-default-scope-on-sortable-finders	Douwe Maan	2017-06-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[skip ci]
\| * \| \| \| \|	Drop default ORDER scope when calling a find method on a Sortable model	Douwe Maan	2017-06-28	5	-4/+52
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'acet-fix-job-sidebar-overflow' into 'master'	Jacob Schatz	2017-06-28	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Jobs: Fix job sidebar overflow issue. Closes #34080 See merge request !12366
\| * \| \| \| \|	Jobs: Fix job sidebar overflow issue.acet-fix-job-sidebar-overflow	Fatih Acet	2017-06-21	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'shell-test-rebuild' into 'master'	Robert Speicher	2017-06-28	2	-12/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reinstall shell on the test env if it's outdated See merge request !12285
\| * \| \| \| \| \|	Reinstall shell on the test env if it's outdatedshell-test-rebuild	Alejandro Rodríguez	2017-06-19	2	-12/+17
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'gitaly-encodings' into 'master'	Robert Speicher	2017-06-28	4	-11/+44
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix gitaly ref encoding bugs Closes #34156 See merge request !12522
\| * \| \| \| \| \| \|	Fix gitaly ref encoding bugs	Jacob Vosmaer	2017-06-28	4	-11/+44
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2017-06-28	1	-1/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'delete_esperanto_translations_of_json_files_generated_from_po_files' into 'master' Delete esperanto translations of json files generated from po files See merge request !12516
\| * \| \| \| \| \| \| \|	delete Esperanto translations of JSON files generated from PO files	黄涛	2017-06-28	1	-1/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2017-06-28	1	-24/+32
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'according_to_comments_to_optimize_existing_bulgarian_translation' into 'master' Synchronous bulgarian translation of Zanata See merge request !12504
\| * \| \| \| \| \| \| \| \|	According to comments to optimize existing bulgarian translation	黄涛	2017-06-28	1	-24/+32
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'winh-no-current-user-search-bar' into 'master'	Clement Ho	2017-06-28	5	-7/+80
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add condition if there is a current user to DropdownUser See merge request !12415
\| * \| \| \| \| \| \| \| \|	Introduce addClassIfElementExists utilitywinh-no-current-user-search-bar	winh	2017-06-27	4	-10/+46
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add condition if there is a current user to DropdownUser	winh	2017-06-27	1	-2/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add failing test for #34141	winh	2017-06-27	1	-0/+34
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'port-changes-ee-2467' into 'master'	Douwe Maan	2017-06-28	4	-0/+57
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port of "2467-repository-sync-dirty-projects" to CE See merge request !12523
\| * \| \| \| \| \| \| \| \| \|	Add ProjectWiki#ensure_repositoryport-changes-ee-2467	Douglas Barbosa Alexandre	2017-06-28	2	-0/+22
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add Project#ensure_repository	Douglas Barbosa Alexandre	2017-06-28	2	-0/+35
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'cherry-pick-5ea675be' into 'master'	Tim Zallmann	2017-06-28	31	-1985/+6120
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'additional-metrics-dashboard' into '28717-additional-metrics-review-branch' See merge request !12454
\| * \| \| \| \| \| \| \| \| \| \|	Fix environment_metrics speccherry-pick-5ea675be	Jose Ivan Vargas	2017-06-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'additional-metrics-dashboard' into ↵	Phil Hughes	2017-06-26	30	-1984/+6119
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'28717-additional-metrics-review-branch' Additional metrics dashboard See merge request !11740
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dm-dependency-linker-newlines' into 'master'	Robert Speicher	2017-06-28	3	-1/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix diff of requirements.txt file by not matching newlines as part of package names Closes #34321 See merge request !12495
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix diff of requirements.txt file by not matching newlines as part of ↵dm-dependency-linker-newlines	Douwe Maan	2017-06-27	3	-1/+10
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	package names
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'cherry-pick-42d87f21' into 'master'	Clement Ho	2017-06-28	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update guide for 9.3 See merge request !12460
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-guides-for-9-3' into '9-3-stable'cherry-pick-42d87f21	Clement Ho	2017-06-27	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update guide for 9.3 See merge request !12038
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'bvl-fix-ldap-login' into 'master'	Douwe Maan	2017-06-28	2	-1/+11
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix setting `last_credential_check_at` on LDAP-login See merge request !12507
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix setting `last_credential_check` on LDAP-loginbvl-fix-ldap-login	Bob Van Landuyt	2017-06-28	2	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'profile-settings-width' into 'master'	Annabel Dunstone Gray	2017-06-28	15	-40/+56
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added limited width to profile settings Closes #20918 See merge request !12386
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Added limited width to profile settingsprofile-settings-width	Phil Hughes	2017-06-23	15	-40/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #20918
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rc/a-better-stub-env' into 'master'	Grzegorz Bizon	2017-06-28	1	-9/+27
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use a slightly cleaner approach to stub ENV See merge request !12481
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Use a slightly cleaner approach to stub ENVrc/a-better-stub-env	Rémy Coutable	2017-06-28	1	-9/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'stop-notification-recipient-service-modifying-participants' ↵	Grzegorz Bizon	2017-06-28	3	-7/+49
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Ensure NotificationRecipientService doesn't modify participants See merge request !12517
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure NotificationRecipientService doesn't modify participants	Sean McGivern	2017-06-28	3	-7/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Even though it does modify the participants of the notification target in some cases, this should have been safe, as different workers are responsible for creating the notifications for each target. However, this is at best confusing, and we should ensure we don't do that.