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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Resolve "/assign me quick action doesn't work if there is extra white space"	Cindy Pallares 🦉	2018-10-19	1	-1/+1
\|
*	Merge branch 'ce-5987-group-file-templates' into 'master'	Robert Speicher	2018-10-19	6	-11/+16
\|\ \| \| \| \| \| \| \| \|	CE backport of changes to suppport group file templates See merge request gitlab-org/gitlab-ce!22310
\| *	Backport CE to changes to support group-level file templates	Nick Thomas	2018-10-19	2	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the feature is available, this setting allows admins to choose a project as a source of custom file templates. This is in addition to any instance-wide templates, whether custom or vendored into the GitLab codebase.
\| *	Stop using ivars in BlobHelper template methods	Nick Thomas	2018-10-19	4	-11/+11
\| \|
* \|	Rename "scheduled" label/badge of delayed jobs to "delayed"	Shinya Maeda	2018-10-19	2	-2/+2
\| \|
* \|	Merge branch '51955-change-single-item-breadcrumbs-to-page-titles' into 'master'	Annabel Dunstone Gray	2018-10-19	16	-24/+82
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Change single-item breadcrumbs to page titles" Closes #51955 See merge request gitlab-org/gitlab-ce!22155
\| * \|	Change single-item breadcrumbs to page titles	Dmitriy Zaporozhets	2018-10-19	16	-24/+82
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Update used version of Runner Helm Chart to 0.1.34	Tomasz Maczukin	2018-10-19	1	-1/+1
\|/ /
* \|	Merge branch 'ccr/43034_issues_controller_100_queries' into 'master'	Douglas Barbosa Alexandre	2018-10-19	4	-41/+58
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add preload for routes and namespaces for issues controller. Closes #43034 See merge request gitlab-org/gitlab-ce!21651
\| * \|	Add preload in issues controller	Chantal Rollison	2018-10-18	4	-41/+58
\| \| \|
* \| \|	Adjust size and alignment of emojis of user status in user menu	Dennis Tang	2018-10-19	3	-9/+15
\| \| \|
* \| \|	Change markdown header tab anchor links to buttons	George Tsiolis	2018-10-19	5	-18/+31
\| \| \|
* \| \|	Merge branch 'revert-62d8b906' into 'master'	Phil Hughes	2018-10-19	1	-145/+145
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'winh-prettier-job-app' into 'master'" See merge request gitlab-org/gitlab-ce!22489
\| * \| \|	Revert "Merge branch 'winh-prettier-job-app' into 'master'"	Filipa Lacerda	2018-10-19	1	-145/+145
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !22463
* \| \| \|	Merge branch 'mr-file-tree-inline-fluid-width-fix' into 'master'	Filipa Lacerda	2018-10-19	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed merge request fill tree not respecting fluid width Closes #52916 See merge request gitlab-org/gitlab-ce!22487
\| * \| \| \|	Fixed merge request fill tree not respecting fluid width	Phil Hughes	2018-10-19	1	-1/+1
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes a bug where the merge request fill tree would not respect the users fluid width preference. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52916
* \| \| \|	Merge branch 'bvl-remove-forked-project-link' into 'master'	Sean McGivern	2018-10-19	11	-95/+63
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove ForkedProjectLink model Closes #38883 See merge request gitlab-org/gitlab-ce!22226
\| * \| \| \|	Remove the `ForkedProjectLink` model	Bob Van Landuyt	2018-10-19	11	-95/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes the `ForkedProjectLink` model that has been replaced by the `ForkNetworkMember` and `ForkNetwork` combination. All existing relations have been adjusted to use these new models. The `forked_project_link` table has been dropped. The "Forks" count on the admin dashboard has been updated to count all `ForkNetworkMember` rows and deduct the number of `ForkNetwork` rows. This is because now the "root-project" of a fork network also has a `ForkNetworkMember` row. This count could become inaccurate when the root of a fork network is deleted.
* \| \| \| \|	Correctly process Bamboo API results	Alex Lossent	2018-10-19	1	-4/+9
\| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bamboo API returns an array of results as per https://docs.atlassian.com/atlassian-bamboo/REST/6.2.5/#d2e786
* \| \| \|	Catch `RedirectionTooDeep` Exception in webhooks	Heinrich Lee Yu	2018-10-19	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'ac-review-app-changes-33418' into 'master'	Nick Thomas	2018-10-19	4	-36/+127
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Expose changed URLs in MR ci_environments_status See merge request gitlab-org/gitlab-ce!22228
\| * \| \|	Show modified and added public paths in MR	Alessio Caiazza	2018-10-18	2	-0/+31
\| \| \| \|
\| * \| \|	Move ci_environments_status to a model	Alessio Caiazza	2018-10-18	4	-36/+96
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GET :namespace/merge_requests/:id/ci_environments_status complexity already reached a limit for a direct serialization from an hash computed at within the controller function. Here we introduce a virtual model EnvironmentStatus and its serializer.
* \| \| \|	Merge branch 'sh-add-audit-logging-json-ce' into 'master'	Stan Hu	2018-10-18	1	-4/+22
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for JSON logging for audit events See merge request gitlab-org/gitlab-ce!22471
\| * \| \| \|	Add support for JSON logging for audit events	Stan Hu	2018-10-18	1	-4/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will add audit_json.log that writes one line per audit event. For example: { "severity":"INFO", "time":"2018-10-17T17:38:22.523Z", "author_id":3, "entity_id":2, "entity_type":"Project", "change":"visibility", "from":"Private", "to":"Public", "author_name":"John Doe4", "target_id":2, "target_type":"Project", "target_details":"namespace2/project2" }
* \| \| \| \|	Merge branch 'winh-prettier-job-app' into 'master'	Clement Ho	2018-10-18	1	-145/+145
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make app/assets/javascripts/jobs/components/job_app.vue prettier See merge request gitlab-org/gitlab-ce!22463
\| * \| \| \|	Make app/assets/javascripts/jobs/components/job_app.vue prettier	Winnie Hellmann	2018-10-18	1	-145/+145
\| \| \| \| \|
* \| \| \| \|	Merge branch 'sh-associate-rakefile-ruby' into 'master'	Clement Ho	2018-10-18	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Associate Rakefile with Ruby icon in diffs Closes #52654 See merge request gitlab-org/gitlab-ce!22341
\| * \| \| \| \|	Associate Rakefile with Ruby icon in diffs	Stan Hu	2018-10-13	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52654
* \| \| \| \| \|	Merge branch '52855-use-monotonic-time-in-webhooks' into 'master'	Stan Hu	2018-10-18	1	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use monotonic time in computing web hook execution time Closes #52855 See merge request gitlab-org/gitlab-ce!22448
\| * \| \| \| \| \|	Use monotonic time in computing web hook execution time	Heinrich Lee Yu	2018-10-18	1	-3/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Resolve "Re-arrange help-related user menu items into new Help menu"	Dennis Tang	2018-10-18	5	-11/+14
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Show wiki empty state layout on wiki-only project overview page	Jacques Erasmus	2018-10-18	1	-8/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'qa-nightly-26' into 'master'	Rémy Coutable	2018-10-18	3	-5/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[QA] Fix the 'clone using deploy key' tests Closes gitlab-org/quality/nightly#26 See merge request gitlab-org/gitlab-ce!22445
\| * \| \| \| \| \| \|	[QA] Fix the 'clone using deploy key' tests	Rémy Coutable	2018-10-18	3	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'ml-qa-code-owners' into 'master'	Rémy Coutable	2018-10-18	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QA: Add support for pushing and viewing files See merge request gitlab-org/gitlab-ce!21911
\| * \| \| \| \| \| \| \|	Add support for pushing and viewing files	Mark Lapierre	2018-10-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The MR below adds a test for the code owners feature. This adds the part of those changes specific to CE - the ability to add and view files in a project. https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7368
* \| \| \| \| \| \| \| \|	Merge branch 'change-generating-url-functions' into 'master'	Rémy Coutable	2018-10-18	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	change generating url functions for external url See merge request gitlab-org/gitlab-ce!22389
\| * \| \| \| \| \| \| \| \|	change generating url functions for external url	benjamin	2018-10-16	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-backport-update-service-fix' into 'master'	Sean McGivern	2018-10-18	1	-2/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Groups::UpdateService#execute not returning correct error code See merge request gitlab-org/gitlab-ce!22446
\| * \| \| \| \| \| \| \| \| \|	Fix Groups::UpdateService#execute not returning correct error code	Stan Hu	2018-10-18	1	-2/+4
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was causing problems in EE, where audit events were being generated even if the project failed to save.
* \| \| \| \| \| \| \| \| \|	Make getting a user by the username case insensitive	William George	2018-10-18	7	-24/+48
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '51386-broken-border-reports' into 'master'	Phil Hughes	2018-10-18	2	-6/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes broken borders in reports section MR widget Closes #51386 See merge request gitlab-org/gitlab-ce!22416
\| * \| \| \| \| \| \| \| \|	Fixes broken borders in reports section MR widget	Filipa Lacerda	2018-10-17	2	-6/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-strip-github-pat-whitespace' into 'master'	Rémy Coutable	2018-10-18	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Strip whitespace around GitHub personal access tokens Closes #46588 See merge request gitlab-org/gitlab-ce!22432
\| * \| \| \| \| \| \| \| \|	Strip whitespace around GitHub personal access tokens	Stan Hu	2018-10-17	1	-1/+1
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some browsers insert a trailing whitespace after pasting the token into the field. This should help reduce confusion. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/46588
* \| \| \| \| \| \| \| \|	Merge branch ↵	Mike Greiling	2018-10-17	2	-142/+152
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'7493-configuring-prometheus-alerts-causes-cluster-install-page-to-display-error-message' into 'master' Backport: Resolve "Configuring Prometheus alerts causes Cluster Install page to display error message" See merge request gitlab-org/gitlab-ce!22408
\| * \| \| \| \| \| \| \| \|	Add missing state on the application row component	Jose Vargas	2018-10-17	2	-142/+152
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes the application row component weird state when an `updating` status is fetched, this causes apps to show as uninstalled even though they are installed in the cluster.
* \| \| \| \| \| \| \| \| \|	Merge branch 'ee-7944-fix-resolve-checkbox-text-color' into 'master'	Clement Ho	2018-10-17	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport from EE: Fix color of text in resolution checkbox See merge request gitlab-org/gitlab-ce!22429
\| * \| \| \| \| \| \| \| \| \|	Backport from EE: set color on note-form-actions	André Luís	2018-10-17	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \|