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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix statement timeouts in RemoveRestrictedTodos migration	Stan Hu	2018-11-04	1	-23/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	On GitLab.com, the RemoveRestrictedTodos background migration encountered about 700+ failures a day due to statement timeouts. PostgreSQL might perform badly with a LIMIT 1 because the planner is guessing that scanning the index in ID order will come across the desired row in less time it will take the planner than using another index. The order_hint does not affect the search results. For example, `ORDER BY id ASC, updated_at ASC` means the same thing as `ORDER BY id ASC`. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52649
*	Merge branch 'sh-optimize-mr-commit-sha-lookup' into 'master'	Douwe Maan	2018-11-03	2	-0/+47
\|\ \| \| \| \| \| \| \| \|	Optimize merge request refresh by using the database to check commit SHAs See merge request gitlab-org/gitlab-ce!22731
\| *	Optimize merge request refresh by using the database to check commit SHAssh-optimize-mr-commit-sha-lookup	Stan Hu	2018-11-02	2	-0/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously for a given merge request, we would: 1. Create the array of commit SHAs involved in the push (A) 2. Request all merge request commits and map the SHA (B) 3. Reload the diff if there were any common commits between A and B We can avoid additional database querying and overhead by checking with the database whether the merge request contains any of the commit SHAs. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/53213
* \|	Merge branch 'use-our-own-docker-image-for-helm-install-pods' into 'master'	Kamil Trzciński	2018-11-02	2	-7/+1
\|\ \ \| \|/ \|/\| \| \| \| \|	Use our own docker image for helm install pods See merge request gitlab-org/gitlab-ce!22778
\| *	Use our own docker image for helm install podsuse-our-own-docker-image-for-helm-install-pods	Dylan Griffith	2018-11-02	2	-7/+1
\| \| \| \| \| \| \| \| \| \| \| \|	This will reduce dependencies and failure points during installation. It will also reduce security risks from untrusted dependencies being able to effect all our users
* \|	Add email for milestone change	Chantal Rollison	2018-11-02	3	-3/+251
\|/
*	Incorporates Kubernetes Namespace into Cluster's flow	Thong Kuah	2018-11-02	18	-295/+616
\|
*	Merge branch '51620-cannot-add-label-to-issue-from-board' into 'master'	Douwe Maan	2018-11-02	2	-0/+46
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Cannot add label to issue from board Closes #51620 See merge request gitlab-org/gitlab-ce!22475
\| *	Rename to assignable_labels_endpoint51620-cannot-add-label-to-issue-from-board	Brett Walker	2018-10-31	1	-1/+1
\| \|
\| *	Dynamically store the valid label endpoint	Brett Walker	2018-10-31	2	-0/+46
\| \| \| \| \| \| \| \| \| \| \| \|	In order to ensure we have the right endpoint to query for an issue's possible valid labels, we store that url in the issue object that gets passed to the frontend.
* \|	Merge branch 'top_level_clusters_controller' into 'master'	Kamil Trzciński	2018-11-02	6	-19/+163
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Top level clusters controller See merge request gitlab-org/gitlab-ce!22438
\| * \|	Remove method as using nested resource routes	Thong Kuah	2018-11-02	1	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We introduced hidden_clusterable_fields in this MR but it is no longer needed as we have gone back to nested resource routes which should provide the params such as `project_id`.
\| * \|	Add missing specs for Presenter	Thong Kuah	2018-11-02	1	-0/+33
\| \| \| \| \| \| \| \| \| \| \| \|	Also add missing interface in abstract class.
\| * \|	Resolve controller sharing concern	Thong Kuah	2018-11-01	4	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use ClustersController as base while having Projects::ClustersController to inform what `clusterable` is. Thanks @ayufan for the great suggestion ! - View changes to work with new approach - Fix javascript for new approach - Fix feature specs for new approach - Fix QA
\| * \|	Move view and path concerns to presenters	Thong Kuah	2018-11-01	3	-1/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Move show path for cluster to ClusterPresenter - Create ClusterablePresenter to encapsulate logic. Consolidates scattered methods from BaseController and ClustersHelper into an object.
\| * \|	Abstract out project out of ClustersController	Thong Kuah	2018-11-01	2	-7/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To the extent possible swap out `project` with `clusterable` - Abstract paths for showing cluster or clusters. This will allow us to swap in alternative paths for group level cluster - Push :project_id and :namespace_id params from the URL to the POST body. - Create a nice helper for to generate links for the destroy action For some reason, spec :project_id and :namespace_id param are not going through `to_param` for a JSON format. Manually call `to_param` to fix specs. - Move :layout to BaseController
\| * \|	Convert clusters to use a top-level controller	Thong Kuah	2018-11-01	4	-18/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In preparation so that we can create both cluster attached to project and cluster attached to group. - Move ClustersController to top level - Move Clusters::ApplicationsController to top-level too - Creates a Clusters::BaseController to share common functions - Do not rely on @project ivar. Anything could set the ivar. - Fix Vue page components due to new data-page value Because of the controller change we have gone from `projects:clusters:new` to `clusters:new`, so we need to update the file location of the page components. There is somewhere a function that will convert data-page to a file location. On that note, projects/clusters/gcp/new/, translate to Projects::Clusters::Gcp#new doesn't exist so replace that with clusters/create_gcp/ and clusters/create_user/
* \| \|	Merge branch '28249-add-pagination' into 'master'	Kamil Trzciński	2018-11-02	3	-0/+25
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds pagination to pipelines table in merge request & commit page Closes #28249 See merge request gitlab-org/gitlab-ce!22696
\| * \| \|	Adds pagination to pipelines table in merge request page28249-add-pagination	Filipa Lacerda	2018-10-31	3	-0/+25
\| \| \| \|
* \| \| \|	Add scheduled flag to job entity	Shinya Maeda	2018-11-02	2	-0/+5
\| \| \| \|
* \| \| \|	Remove ci_enable_scheduled_build feature flag	Shinya Maeda	2018-11-02	3	-52/+8
\| \| \| \|
* \| \| \|	Merge branch 'sh-optimize-reload-diffs-service' into 'master'	Sean McGivern	2018-11-02	3	-8/+19
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Significantly cut memory and SQL queries when reloading diffs See merge request gitlab-org/gitlab-ce!22725
\| * \| \| \|	Fix merge request specs that expect diff_files to be calledsh-optimize-reload-diffs-service	Stan Hu	2018-11-01	2	-8/+8
\| \| \| \| \|
\| * \| \| \|	Significantly cut memory usage and SQL queries when reloading diffs	Stan Hu	2018-11-01	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By preloading certain models with the diff, we can eliminate many N+1 queries. For a push to the staging GitLab.com www-gitlab-com repository, this eliminates over 3000 SQL queries and appears to bring down the RSS usage by several gigabytes. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/49703
* \| \| \| \|	Merge branch '52548-links-in-tabs-of-the-labels-index-pages-ends-with-html' ↵	Sean McGivern	2018-11-02	1	-0/+25
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Links in tabs of the labels index pages ends with `.html`" Closes #52548 See merge request gitlab-org/gitlab-ce!22716
\| * \| \| \| \|	Fix typo in labels_helper_spec.rb52548-links-in-tabs-of-the-labels-index-pages-ends-with-html	Dmitriy Zaporozhets	2018-11-01	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix bug when links in tabs of the labels index pages ends with .html	Dmitriy Zaporozhets	2018-10-31	1	-0/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	add related merge request endpoint	Helmut Januschka	2018-11-01	1	-0/+68
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'engwan/gitlab-ce-44012-filter-reactions-none-any'	Sean McGivern	2018-11-01	5	-10/+72
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix tests	Heinrich Lee Yu	2018-11-01	4	-10/+30
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add tests	Heinrich Lee Yu	2018-11-01	3	-4/+46
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '52382-filter-milestone-api-none-any' into 'master'	Sean McGivern	2018-11-01	2	-4/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Filter by `None`/`Any` for milestone in issues/mrs API" Closes #52382 See merge request gitlab-org/gitlab-ce!22637
\| * \| \| \| \| \|	Update API to accept None and Any	Heinrich Lee Yu	2018-11-01	2	-4/+16
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'	Achilleas Pipinellis	2018-11-01	62	-85/+85
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typos in comments and specs See merge request gitlab-org/gitlab-ce!22683
\| * \| \| \| \| \|	Fix typos in comments and specs	George Tsiolis	2018-11-01	62	-85/+85
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-optimize-merge-request-project-lookup' into 'master'	Sean McGivern	2018-11-01	2	-0/+18
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce SQL queries needed to load open merge requests See merge request gitlab-org/gitlab-ce!22709
\| * \| \| \| \| \|	Reduce SQL queries needed to load open merge requestssh-optimize-merge-request-project-lookup	Stan Hu	2018-10-30	2	-0/+18
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The SQL queries and memory allocation in MergeRequests::RefreshService is dominated by queries for Project and Route loads. On staging, the absence of an inverse relationship caused Rails to make over 1100 extraneous SQL queries for the www-gitlab-com repository. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/49703
* \| \| \| \| \|	Merge branch 'prettify-all-remaining-things' into 'master'	Filipa Lacerda	2018-10-31	23	-497/+493
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prettify remaining files with differences in CE and EE See merge request gitlab-org/gitlab-ce!22702
\| * \| \| \| \| \|	Fix eslint violations	Mike Greiling	2018-10-31	2	-0/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Prettify remaining files with differences in CE and EE	Mike Greiling	2018-10-31	23	-497/+487
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'gt-fix-quick-links-button-styles' into 'master'	Annabel Dunstone Gray	2018-10-31	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix quick links button styles Closes #52220 and #52063 See merge request gitlab-org/gitlab-ce!22657
\| * \| \| \| \|	Fix quick links button styles	George Tsiolis	2018-10-29	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '53335-cancel-job-redirects-to-job-page' into 'master'	Grzegorz Bizon	2018-10-31	2	-11/+41
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Send continue parameter on for `cancel_path` Closes #53335 See merge request gitlab-org/gitlab-ce!22712
\| * \| \| \| \|	Use array syntax instead of dig for consistency	Steve Azzopardi	2018-10-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We are using hash[symbol][symbol] everywhere else in the test file.
\| * \| \| \| \|	Send continue parameter on for cancel_path	Steve Azzopardi	2018-10-31	2	-10/+40
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21595 `ContinueParams` was introducted in the `Projects::JobController#cancel` since `continue` parameter is not present for in `cancel_path` for `Projects::JobController#show.sjon` the user is being redirect to the pipeline page, where it should be redirected to the current job page instead. Add the `continue` parameter as a query string for `cancel_path`.
* \| \| \| \|	Merge branch ↵	Filipa Lacerda	2018-10-31	4	-4/+14
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'41545-gitlab-merge-request-status-could-not-connect-to-the-ci-server-please-check-your-settings-and-try-again' into 'master' Resolve "Reword error message for internal CI unknown pipeline status" Closes #53056 See merge request gitlab-org/gitlab-ce!22474
\| * \| \| \|	Fix rspec error text regex	Matija Čupić	2018-10-24	2	-3/+3
\| \| \| \| \|
\| * \| \| \|	Regenerates pot files	Filipa Lacerda	2018-10-24	3	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Makes documentation path a required prop
\| * \| \| \|	Change CI status error message	Matija Čupić	2018-10-24	3	-3/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'add-language-param-to-highlight' into 'master'	Douwe Maan	2018-10-30	9	-83/+183
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add language param to highlight See merge request gitlab-org/gitlab-ce!21584