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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Inform user that current shared projects will remain shareddm-group-share-lock-default-help	Douwe Maan	2017-09-22	1	-1/+1
\|
*	Merge branch '37220-es-modules' into 'master'	Phil Hughes	2017-09-21	41	-870/+931
\|\ \| \| \| \| \| \| \| \|	Use modules in common utils See merge request gitlab-org/gitlab-ce!14074
\| *	Exports all the methods in the same place37220-es-modules	Filipa Lacerda	2017-09-18	1	-25/+28
\| \|
\| *	Merge branch 'master' into 37220-es-modules	Mike Greiling	2017-09-18	357	-4475/+7015
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (148 commits) Remove gaps under nav on build page Replace the 'project/snippets.feature' spinach test with an rspec analog Use correct group members path for members flyout link Replace the 'project/commits/revert.feature' spinach test with an rspec analog Merge branch 'rs-incoming-email-domain-docs' into 'security-10-0' Replace the 'project/archived.feature' spinach test with an rspec analog Fix broken link in docs/api/wiki.md Fixed the new sidebars width when browser has scrollbars Improve 'spec/features/profiles/*' specs Replace the 'search.feature' spinach test with an rspec analog dedupe yarn packages add dependency approvals (all MIT license) update build image to latest with node 8.x, yarn 1.0.2, and chrome 61 Ensure we use `Entities::User` for non-admin `users/:id` API requests Minor update to address Sean McGivern's comment. Add data migration Fix setting share_with_group_lock created services for keys Prepare Repository#merge for migration to Gitaly Never connect to webpack-dev-server over SSL ...
\| * \|	Fix context for jquery event	Filipa Lacerda	2017-09-15	1	-7/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Remove unused function
\| * \|	fixed mr widget options spec	Phil Hughes	2017-09-13	1	-3/+2
\| \| \|
\| * \|	fixed todos spec	Phil Hughes	2017-09-12	2	-28/+15
\| \| \|
\| * \|	Merge branch 'master' into 37220-es-modules	Filipa Lacerda	2017-09-12	101	-1184/+1735
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (35 commits) Use WikiPages::CreateService in spec/features/projects/wiki/user_updates_wiki_page_spec.rb Replace the 'project/merge_requests/revert.feature' spinach test with an rspec analog Docs group mrs list view search bar Replace the project/milestone.feature spinach test with an rspec analog Make all the tooltips in the same direction on the commit info box Reset all connection schema cache after migration tests Emoji was rendered as italic Adds Event polyfill for IE Add gitaly to patch update doc Document how to swap database tables. Replace 'project/wiki.feature' spinach test with an rspec analog Check for sidebar cookie instead of class when resizing window update installation and update instructions for 10.0 Replace the 'project/merge_requests/accept.feature' spinach test with an rspec analog Remove confidential toggle checkbox and related code as no longer necessary Bump grape_logging gem to 1.7.0 to get status codes for error messages Expand filtered parameters to include `token` Replace the project/team_management.feature spinach test with an rspec analog Replace the profile/emails.feature spinach test with an rspec analog Replace project/group_links.feature spinach test with an rspec analog ...
\| * \| \|	fixed location.pathname not being reset	Phil Hughes	2017-09-12	1	-1/+1
\| \| \| \|
\| * \| \|	Import modules instead of using the ones in global namespace	Filipa Lacerda	2017-09-09	32	-170/+233
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes set favicon related methods from global scope Improves test related with favicon Removes convertPermissionToBoolean from global scope. Adds tests for convertPermissionToBoolean - were non existant Removes setParamInURL from gl.utils Removes parseIntPagination from gl.utils namespace Remove normalizeCRLFHeaders from gl.utils namespace Removes normalizeHeaders from gl.utils namespace Use gl.utils for filtered search Fix bad import Fix broken test by cleaning window.history namespace Adds changelog
\| * \| \|	Use modules in common utils	Filipa Lacerda	2017-09-09	14	-769/+779
\| \| \| \|
* \| \| \|	Merge branch 'feature/plantuml-restructured-text' into 'master'	Douwe Maan	2017-09-21	3	-3/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade gitlab-markup gem See merge request gitlab-org/gitlab-ce!14395
\| * \| \| \|	Upgrade gitlab-markup gem	Markus Koller	2017-09-20	3	-3/+8
\| \| \| \| \|
* \| \| \| \|	Merge branch '38088-remove-banner-to-customize-experience' into 'master'	Douwe Maan	2017-09-21	6	-157/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Remove banner to customize experience" Closes #38088 See merge request gitlab-org/gitlab-ce!14384
\| * \| \| \| \|	Deleted another Fixture due to User Callout38088-remove-banner-to-customize-experience	Tim Zallmann	2017-09-20	1	-30/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Fixture Creation removed	Tim Zallmann	2017-09-20	1	-5/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Deleted Karma Specs for userCallout	Tim Zallmann	2017-09-20	1	-49/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Removed User Callout for Customer Experience	Tim Zallmann	2017-09-20	4	-73/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'events-redundant-where' into 'master'	Rémy Coutable	2017-09-21	3	-7/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant WHERE from event queries Closes #38129 See merge request gitlab-org/gitlab-ce!14389
\| * \| \| \| \| \|	Remove redundant WHERE from event queriesevents-redundant-where	Yorick Peterse	2017-09-20	3	-7/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The default scope in Event would add a "WHERE author_id IS NOT NULL" clause to every query. Now that "events.author_id" has a NOT NULL clause set this filter is redundant and we can safely remove it. In this commit we also add a validation on events.author_id (previously only defined in PushEvent) just in case something tries to create data without an author ID. This way we can present a nicer error message compared to PostgreSQL's foreign key error messages. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/38129
* \| \| \| \| \| \|	Merge branch 'remove-use-key-worker' into 'master'	Rémy Coutable	2017-09-21	8	-65/+116
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop using Sidekiq for updating Key#last_used_at Closes #36663 See merge request gitlab-org/gitlab-ce!14391
\| * \| \| \| \| \| \|	Stop using Sidekiq for updating Key#last_used_atremove-use-key-worker	Yorick Peterse	2017-09-20	8	-65/+116
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes things simpler as no scheduling is involved. Further we remove the need for running a SELECT + UPDATE just to get the key and update it, whereas we only need an UPDATE when setting last_used_at directly in a request. The added service class takes care of updating Key#last_used_at without using Sidekiq. Further it makes sure we only try to obtain a Redis lease if we're confident that we actually need to do so, instead of always obtaining it. We also make sure to _only_ update last_used_at instead of also updating updated_at. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36663
* \| \| \| \| \| \|	Merge branch 'resolve-discussions-btn' into 'master'	Phil Hughes	2017-09-21	1	-14/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make resolve discussion icon gray See merge request gitlab-org/gitlab-ce!14398
\| * \| \| \| \| \| \|	Make resolve discussion icon grayresolve-discussions-btn	Annabel Dunstone Gray	2017-09-20	1	-14/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '10-0-sync-master' into 'master'	Simon Knox	2017-09-21	16	-79/+19
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sync dev to gitlab.com See merge request gitlab-org/gitlab-ce!14406
\| * \ \ \ \ \ \ \	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Jarka Kadlecova	2017-09-21	16	-79/+19
\| \|\ \ \ \ \ \ \ \ \|/ / / / / / / / /
\| * \| \| \| \| \| \| \|	Update CHANGELOG.md for 9.5.5	Simon Knox	2017-09-18	16	-79/+19
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'fix-image-diff-swipe-handle' into 'master'	Annabel Dunstone Gray	2017-09-20	2	-1/+7
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix image diff swipe handle offset to correctly align with the frame Closes #37928 See merge request gitlab-org/gitlab-ce!14392
\| * \| \| \| \| \| \|	Fix image diff swipe handle offset to correctly align with the framefix-image-diff-swipe-handle	Clement Ho	2017-09-20	2	-1/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '38049-fix-resolve-in-new-issue-btn' into 'master'	Annabel Dunstone Gray	2017-09-20	3	-8/+17
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the "resolve discussion in a new issue" button Closes #38049 See merge request gitlab-org/gitlab-ce!14357
\| * \| \| \| \| \| \|	Fix the "resolve discussion in a new issue" button	Nick Thomas	2017-09-20	3	-8/+17
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '37862-breadcrumbs-mobile' into 'master'	Tim Zallmann	2017-09-20	2	-5/+12
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix mobile sidebar button to match height of desktop breadcrumbs Closes #37862 See merge request gitlab-org/gitlab-ce!14282
\| * \| \| \| \| \| \|	Vertically center hamburger button37862-breadcrumbs-mobile	Annabel Dunstone Gray	2017-09-18	2	-7/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Increase tap target on hamburger menu	Annabel Dunstone Gray	2017-09-15	2	-3/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix mobile sidebar button to match height of desktop breadcrumbs	Annabel Dunstone Gray	2017-09-14	1	-0/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'gitlab-git-popen' into 'master'	Douwe Maan	2017-09-20	7	-13/+19
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Gitlab::Git's Popen on that module's code Closes gitaly#597 See merge request gitlab-org/gitlab-ce!14237
\| * \| \| \| \| \| \| \|	Use Gitlab::Git's Popen on that module's codegitlab-git-popen	Alejandro Rodríguez	2017-09-20	7	-13/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows the current Gitaly migration to depend on less code outside of the Gitlab::Git module
* \| \| \| \| \| \| \| \|	Merge branch '32796-tighten-up-remove-old-while-backing-up-gitlab' into 'master'	Rémy Coutable	2017-09-20	2	-10/+38
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tighten up remove_old regex from gitlab backup manager. Closes #32796 See merge request gitlab-org/gitlab-ce!14333
\| * \| \| \| \| \| \| \| \|	Tighten up remove_old regex from gitlab backup manager.32796-tighten-up-remove-old-while-backing-up-gitlab	Tiago Botelho	2017-09-20	2	-10/+38
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'workhorse-3.1.0' into 'master'	Rémy Coutable	2017-09-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitlab-workhorse 3.1.0 See merge request gitlab-org/gitlab-ce!14390
\| * \| \| \| \| \| \| \| \|	Use gitlab-workhorse 3.1.0	Jacob Vosmaer	2017-09-20	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix-counts-caching' into 'master'	Douwe Maan	2017-09-20	12	-15/+28
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix refreshing of issues/MR count caches Closes #38061 See merge request gitlab-org/gitlab-ce!14363
\| * \| \| \| \| \| \| \| \|	Fix refreshing of issues/MR count cachesfix-counts-caching	Yorick Peterse	2017-09-19	12	-15/+28
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \| \| \| \|	Merge branch 'fix-autodevops-monitoring' into 'master'	Kamil Trzciński	2017-09-20	1	-4/+0
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support new auto-deploy helm chart Closes #38028 See merge request gitlab-org/gitlab-ce!14386
\| * \| \| \| \| \| \| \|	Support new auto-deploy helm chartfix-autodevops-monitoring	Alessio Caiazza	2017-09-20	1	-4/+0
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New auto-deploy helm chart has new names in order to support Auto Monitoring. Works with, but does not require charts/charts.gitlab.io!66 See gitlab-ce#38028
* \| \| \| \| \| \| \|	Merge branch '37713-enable-ee_compat_check-for-forks' into 'master'	Rémy Coutable	2017-09-20	3	-4/+12
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable ee_compat_check for forks, but not EE Closes #37713 See merge request gitlab-org/gitlab-ce!14189
\| * \| \| \| \| \| \| \|	Update ee_compat_check for community contributors37713-enable-ee_compat_check-for-forks	Lin Jen-Shin	2017-09-15	1	-1/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Enable ee_compat_check for forks, but not EE	Lin Jen-Shin	2017-09-15	2	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We exclude known EE projects, and check the project directory name for EE forks.
* \| \| \| \| \| \| \| \|	Merge branch '36884-gitaly-admin-version' into 'master'	Tim Zallmann	2017-09-20	3	-2/+17
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Gitaly version to Admin Dashboard Closes #36884 See merge request gitlab-org/gitlab-ce!14313
\| * \| \| \| \| \| \| \| \|	Add Gitaly version to Admin Dashboard	Jacopo	2017-09-19	3	-2/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Displays the Gitaly version in the admin dashboard.