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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Allow the git circuit breaker to correctly handle missing repository storages	Nick Thomas	2017-09-22	1	-0/+5
\|
*	Merge branch 'add-view-replaced-file-link' into 'master'	Rémy Coutable	2017-09-22	1	-0/+5
\|\ \| \| \| \| \| \| \| \|	Add view replaced file link for image diffs See merge request gitlab-org/gitlab-ce!14394
\| *	Add view replaced file link for image diffsadd-view-replaced-file-link	Clement Ho	2017-09-20	1	-0/+5
\| \|
* \|	Merge branch 'replace_project_service.feature' into 'master'	Rémy Coutable	2017-09-22	1	-0/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace the 'project/service.feature' spinach test with an rspec analog Closes #23036 See merge request gitlab-org/gitlab-ce!14432
\| * \|	Replace the 'project/service.feature' spinach test with an rspec analog	Vitaliy @blackst0ne Klachkov	2017-09-22	1	-0/+5
\| \| \|
* \| \|	Merge branch 'voogsgerd/gitlab-ce-daniel-legacy-config' into 'master'	Rémy Coutable	2017-09-22	1	-0/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed two legacy config options See merge request gitlab-org/gitlab-ce!14425
\| * \| \|	Removed two legacy config optionsvoogsgerd/gitlab-ce-daniel-legacy-config	Daniel Voogsgerd	2017-09-21	1	-0/+5
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Removed the max_size and timeout options from the git config in gitlab.yml.
* \| \|	Merge branch 'fix-multi-line-hook-output' into 'master'	Rémy Coutable	2017-09-22	1	-0/+5
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display full pre-receive and post-receive hook output in GitLab UI Closes #25214 See merge request gitlab-org/gitlab-ce!14222
\| * \|	Display full pre-receive and post-receive hook output in GitLab UI	Robin Bobbitt	2017-09-21	1	-0/+5
\| \| \|
* \| \|	Merge branch 'force-two-up-view' into 'master'	Filipa Lacerda	2017-09-21	1	-0/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Force two up view Closes #32613 See merge request gitlab-org/gitlab-ce!14397
\| * \| \|	[skip ci] Add changelogforce-two-up-view	Clement Ho	2017-09-20	1	-0/+5
\| \| \|/ \| \|/\|
* \| \|	Correctly detect multiple issue URLs after 'Closes...' in MR descriptionsdm-closing-issue-urls	Douwe Maan	2017-09-21	1	-0/+5
\| \|/ \|/\|
* \|	Merge branch '37220-es-modules' into 'master'	Phil Hughes	2017-09-21	1	-0/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use modules in common utils See merge request gitlab-org/gitlab-ce!14074
\| * \	Merge branch 'master' into 37220-es-modules	Mike Greiling	2017-09-18	45	-0/+226
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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 ...
\| * \ \	Merge branch 'master' into 37220-es-modules	Filipa Lacerda	2017-09-12	14	-0/+71
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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 ...
\| * \| \| \|	Import modules instead of using the ones in global namespace	Filipa Lacerda	2017-09-09	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \|	Merge branch 'feature/plantuml-restructured-text' into 'master'	Douwe Maan	2017-09-21	1	-0/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade gitlab-markup gem See merge request gitlab-org/gitlab-ce!14395
\| * \| \| \| \|	Upgrade gitlab-markup gem	Markus Koller	2017-09-20	1	-0/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'events-redundant-where' into 'master'	Rémy Coutable	2017-09-21	1	-0/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+5
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+5
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'master' of dev.gitlab.org:gitlab/gitlabhq	Jarka Kadlecova	2017-09-21	15	-79/+0
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Update CHANGELOG.md for 9.5.5	Simon Knox	2017-09-18	15	-79/+0
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'fix-image-diff-swipe-handle' into 'master'	Annabel Dunstone Gray	2017-09-20	1	-0/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+5
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '38049-fix-resolve-in-new-issue-btn' into 'master'	Annabel Dunstone Gray	2017-09-20	1	-0/+5
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '36884-gitaly-admin-version' into 'master'	Tim Zallmann	2017-09-20	1	-0/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Displays the Gitaly version in the admin dashboard.
* \| \| \| \| \| \|	Fix rewriting issue references with group milestones	Grzegorz Bizon	2017-09-20	1	-0/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '20049-projects-api-forks' into 'master'	Rémy Coutable	2017-09-20	1	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "make project data via API report forks of this project" Closes #20049 See merge request gitlab-org/gitlab-ce!14355
\| * \| \| \| \| \| \|	Add an API endpoint to determine the forks of a project	Mark Fletcher	2017-09-20	1	-0/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'add_tooltip_for_milestone_in_issues_list' into 'master'	Douwe Maan	2017-09-20	1	-0/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tooltip for milestone due date to issue and merge request lists Closes #18864 See merge request gitlab-org/gitlab-ce!14318
\| * \| \| \| \| \| \| \|	Add tooltip for milestone due date to issue and merge request lists	Vitaliy @blackst0ne Klachkov	2017-09-20	1	-0/+5
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'mk-clarify-moving-namespaces' into 'master'	Douwe Maan	2017-09-20	1	-0/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify how to rename username or group path See merge request gitlab-org/gitlab-ce!13914
\| * \| \| \| \| \| \| \|	Add changelog entrymk-clarify-moving-namespaces	Michael Kozono	2017-09-19	1	-0/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '37894-handle-if-auto-devops-domain-is-not-set' into 'master'	Stan Hu	2017-09-19	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Handle if Auto DevOps domain is not set" Closes #37894 See merge request gitlab-org/gitlab-ce!14319
\| * \| \| \| \| \| \| \| \|	Add warning message if domain or cluster are not configured	bokebilly	2017-09-19	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Stan Hu	2017-09-19	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'37890-auto-devops-banner-is-not-shown-when-the-repository-is-empty-new-project' into 'master' Resolve "Auto DevOps banner is not shown when the repository is empty (new project)" Closes #37890 See merge request gitlab-org/gitlab-ce!14321
\| * \| \| \| \| \| \| \| \| \|	Fix changelog37890-auto-devops-banner-is-not-shown-when-the-repository-is-empty-new-project	Kamil Trzcinski	2017-09-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add new file	Fabio Busatto	2017-09-19	1	-0/+5
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'reoganize-deployment-indexes' into 'master'	Stan Hu	2017-09-19	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reorganize indexes for the "deployments" table Closes #36877 See merge request gitlab-org/gitlab-ce!14348
\| * \| \| \| \| \| \| \| \| \|	Reorganize indexes for the "deployments" tablereoganize-deployment-indexes	Yorick Peterse	2017-09-19	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes the need for a default scope that adds a "WHERE project_id = X" clause. This commit also includes an additional index for Environment#last_deployment, ensuring this query uses just an index scan instead of also applying a Filter. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36877
* \| \| \| \| \| \| \| \| \| \|	Do not perform hard check (presence of file on storage)	Kamil Trzcinski	2017-09-19	1	-0/+5
\| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead perform soft check (the column set to indicate that file does exist)
* \| \| \| \| \| \| \| \| \|	Merge branch '37999-fix-circuit-breaker' into 'master'	Douwe Maan	2017-09-19	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the filesystem shard health check to check all configured shards Closes #37999 See merge request gitlab-org/gitlab-ce!14341
\| * \| \| \| \| \| \| \| \| \|	Fix the filesystem shard health check to check all configured shards	Nick Thomas	2017-09-19	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-stop-loading-issue-discussions' into 'master'	Douwe Maan	2017-09-19	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary loading of discussions in `IssuesController#show` Closes #38034 See merge request gitlab-org/gitlab-ce!14351
\| * \| \| \| \| \| \| \| \| \|	Remove unnecessary loading of discussions in `IssuesController#show`sh-stop-loading-issue-discussions	Stan Hu	2017-09-19	1	-0/+5
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Discussions are now done asynchronously via the `IssuesController#discussions` endpoint, so this should no longer be needed. This was taking 32% of the load time for GitLab CE issue 1. Closes #38034
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-project-feature-eager-load' into 'master'	Yorick Peterse	2017-09-19	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate N+1 queries referencing issues Closes #38033 See merge request gitlab-org/gitlab-ce!14349