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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix refreshing of issues/MR count cachesfix-counts-caching	Yorick Peterse	2017-09-19	6	-6/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures the open issues/MR count caches are refreshed properly when creating new issues or MRs. This MR also includes a change to the cache keys to ensure all caches are rebuilt on the fly. This particular problem was not caught in the test suite due to a null cache being used, resulting in all calls that would use a cache using the underlying data directly. In production the code would fail because a newly saved record returns an empty hash in #changes meaning checks such as `state_changed? \|\| confidential_changed?` would return false for new rows, thus never updating the counters. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/38061
*	Detect n+1 issues involving Gitaly	Andrew Newdigate	2017-09-19	2	-2/+132
\|
*	Merge branch 'rc/improve-users-api-specs' into 'master'	Grzegorz Bizon	2017-09-19	3	-32/+27
\|\ \| \| \| \| \| \| \| \|	Improve the Users API specs by asserting against the response schema See merge request gitlab-org/gitlab-ce!14334
\| *	Improve the Users API specs by asserting against the response schemarc/improve-users-api-specs	Rémy Coutable	2017-09-18	3	-32/+27
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'issue_32215' into 'master'	Rémy Coutable	2017-09-19	2	-4/+18
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow DEVELOPER role to admin milestones Closes #32215 See merge request gitlab-org/gitlab-ce!14257
\| * \|	Allow DEVELOPER role to admin milestonesissue_32215	Felipe Artur	2017-09-18	2	-4/+18
\| \| \|
* \| \|	Change all instances of btn-sm to btn-small to keep things consistent	Jedidiah	2017-09-19	1	-1/+1
\| \| \|
* \| \|	Merge branch 'zj-update-project-settings' into 'master'	Grzegorz Bizon	2017-09-19	1	-0/+43
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow updating of project auto devops settings Closes #37893 See merge request gitlab-org/gitlab-ce!14291
\| * \| \|	Fix instance default option being true as value	Zeger-Jan van de Weg	2017-09-18	1	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a user selected 'Instance default' as value for the auto devops settings, this was interpreted as a true value. Now we post an empty string in this case, meaning we want to set `NULL` in the database. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37893#note_40541294
\| * \| \|	Allow updating of project auto devops settings	Zeger-Jan van de Weg	2017-09-15	1	-0/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updating didn't work, as the project_id was missing to be set for the project_auto_devops model. Fixes gitlab-org/gitlab-ce#37893
* \| \| \|	Merge branch '34259-project-denial-of-service-via-gitmodules-fix' into 'master'	Robert Speicher	2017-09-19	1	-0/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes project denial of service via gitmodules using Extended ASCII. Closes #34259 See merge request gitlab-org/gitlab-ce!14301
\| * \| \| \|	Fixes project denial of service via gitmodules using Extended ASCII.34259-project-denial-of-service-via-gitmodules-fix	Tiago Botelho	2017-09-15	1	-0/+6
\| \| \| \| \|
* \| \| \| \|	Fix MR widget with external CI services/integrations33287-fix-mr-widget-errors-with-external-services	Eric Eastwood	2017-09-18	5	-16/+128
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33287 The MR widget was trying to render the pipelines section when there are no GitLab CI pipelines which was throwing some NPE errors.
* \| \| \| \|	fix #35290 Make read-only API for public merge requests available without ↵	haseeb	2017-09-18	1	-5/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	authentication
* \| \| \| \|	Merge branch 'add_closed_at_attribute' into 'master'	Rémy Coutable	2017-09-18	2	-1/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add 'closed_at' attribute to Issues API Closes #5935 See merge request gitlab-org/gitlab-ce!14316
\| * \| \| \| \|	Add 'closed_at' attribute to Issues API	Vitaliy @blackst0ne Klachkov	2017-09-16	2	-1/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'sh-optimize-discussion-json' into 'master'	Yorick Peterse	2017-09-18	1	-0/+32
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate N+1 queries in loading discussions.json endpoint Closes #37955 See merge request gitlab-org/gitlab-ce!14327
\| * \| \| \| \| \|	Eliminate N+1 queries in loading discussions.json endpointsh-optimize-discussion-json	Stan Hu	2017-09-18	1	-0/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In #37955,we see that the profile had a number of N+1 queries from repeated access to `cross_reference_not_visible_for?`. This was optimized in previous versions of GitLab by rendering all notes at once, counting the number of visible references, and then using that number to check whether a system note should be fully redacted. There was also another N+1 query calling `ProjectTeam#member?`, which did not take advantage of an optimization in prepare_notes_for_rendering that would preload the maximum access level per project. Closes #37955
* \| \| \| \| \| \|	Merge branch 'milestone-avatar-issuable-link' into 'master'	Tim Zallmann	2017-09-18	1	-0/+19
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes milestone issuable assignee URL Closes #33124 See merge request gitlab-org/gitlab-ce!14292
\| * \| \| \| \| \| \|	Fixes milestone issuable assignee URLmilestone-avatar-issuable-link	Phil Hughes	2017-09-15	1	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #33124
* \| \| \| \| \| \| \|	Merge branch '37789-followup-for-read-registry-change' into 'master'	Rémy Coutable	2017-09-18	3	-10/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up read_registry scope changes Closes #37789 See merge request gitlab-org/gitlab-ce!14307
\| * \| \| \| \| \| \| \|	Clean up read_registry scope changes	Robin Bobbitt	2017-09-18	3	-10/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #37789
* \| \| \| \| \| \| \| \|	Merge branch 'update-user_uses_slash_commands_spec' into 'master'	Rémy Coutable	2017-09-18	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor update to address Sean McGivern's comment. See merge request gitlab-org/gitlab-ce!14311
\| * \| \| \| \| \| \| \| \|	Minor update to address Sean McGivern's comment.	manolis	2017-09-15	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More details are available here https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13436/diffs#note_39115837
* \| \| \| \| \| \| \| \| \|	Merge branch 'replace_project_snippets.feature' into 'master'	Rémy Coutable	2017-09-18	4	-0/+90
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace the 'project/snippets.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14326
\| * \| \| \| \| \| \| \| \| \|	Replace the 'project/snippets.feature' spinach test with an rspec analog	Vitaliy @blackst0ne Klachkov	2017-09-18	4	-0/+90
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'operation-service-merge' into 'master'	Rémy Coutable	2017-09-18	4	-32/+11
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepare Repository#merge for migration to Gitaly Closes gitaly#559 See merge request gitlab-org/gitlab-ce!14154
\| * \| \| \| \| \| \| \| \| \|	Prepare Repository#merge for migration to Gitalyoperation-service-merge	Jacob Vosmaer	2017-09-15	4	-32/+11
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '24121_extract_yet_another_users_finder' into 'master'	Grzegorz Bizon	2017-09-18	1	-0/+97
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract AutocompleteController#users into finder Closes #24121 See merge request gitlab-org/gitlab-ce!13778
\| * \| \| \| \| \| \| \| \| \| \|	move `find_users` method into finder and add `load_group` method	Maxim Rydkin	2017-09-10	1	-4/+28
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	rename yet_another_users_finder into autocomplete_users_finder	Maxim Rydkin	2017-09-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	fix rubocop	Maxim Rydkin	2017-09-10	1	-8/+7
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	finish spec/finders/yet_another_users_finder_spec.rb	Maxim Rydkin	2017-09-10	1	-54/+42
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	extract finder and add first test	Maxim Rydkin	2017-09-10	1	-0/+86
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'replace_project_commits_revert.feature' into 'master'	Rémy Coutable	2017-09-18	1	-0/+56
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace the 'project/commits/revert.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14325
\| * \| \| \| \| \| \| \| \| \| \| \|	Replace the 'project/commits/revert.feature' spinach test with an rspec analog	Vitaliy @blackst0ne Klachkov	2017-09-18	1	-0/+56
\| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'replace_project_archived.feature' into 'master'	Rémy Coutable	2017-09-18	1	-0/+43
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace the 'project/archived.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14322
\| * \| \| \| \| \| \| \| \| \| \| \|	Replace the 'project/archived.feature' spinach test with an rspec analog	Vitaliy @blackst0ne Klachkov	2017-09-17	1	-0/+43
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'improve_spec_features_profiles_specs' into 'master'	Rémy Coutable	2017-09-18	8	-38/+39
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve 'spec/features/profiles/*' specs Closes #37855 et #37856 See merge request gitlab-org/gitlab-ce!14317
\| * \| \| \| \| \| \| \| \| \| \| \|	Improve 'spec/features/profiles/*' specs	Vitaliy @blackst0ne Klachkov	2017-09-16	8	-38/+39
\| \| \|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'replace_search.feature' into 'master'	Rémy Coutable	2017-09-18	12	-310/+559
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace the 'search.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14248
\| * \| \| \| \| \| \| \| \| \| \| \|	Replace the 'search.feature' spinach test with an rspec analog	Vitaliy @blackst0ne Klachkov	2017-09-16	12	-310/+559
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'mk-delete-conflicting-redirects-mysql' into 'master'	Douwe Maan	2017-09-18	3	-0/+220
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up redirect routes that conflict with regular routes Closes #36229 See merge request gitlab-org/gitlab-ce!13783
\| * \| \| \| \| \| \| \| \| \| \|	Reduce batch sizemk-delete-conflicting-redirects-mysql	Michael Kozono	2017-09-14	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	…to stay within our query timeout of 60s. Also reduce the job interval to keep the same overall migration time of ~3.3 days.
\| * \| \| \| \| \| \| \| \| \| \|	Spread out the work a little	Michael Kozono	2017-09-14	2	-6/+73
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Extract helper for queuing background jobs	Michael Kozono	2017-09-14	2	-2/+64
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add specs for deleting conflicting redirects	Michael Kozono	2017-09-14	2	-0/+91
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Fixed the new sidebars width when browser has scrollbars	Phil Hughes	2017-09-16	1	-1/+8
\| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' into 'issue_37640'issue_37640	Felipe Artur	2017-09-15	87	-1909/+2938
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \| \| \| \|	Merge branch 'fix-share-with-group-lock-update' into 'master'	Robert Speicher	2017-09-15	1	-0/+15
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix setting share_with_group_lock Closes #37916 See merge request gitlab-org/gitlab-ce!14300