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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add controller concern for paginated collections65988-optimize-snippet-listings	Markus Koller	2019-09-10	7	-89/+96
\| \| \| \| \| \|	We had similar code in a few places to redirect to the last page if the given page number is out of range. This unifies the handling in a new controller concern and adds usage of it in all snippet listings.
*	Optimize queries for snippet listings	Markus Koller	2019-09-10	1	-0/+29
\| \| \| \| \|	- Avoid N+1 queries for authors and comment counts - Avoid an additional snippet existence query
*	Merge branch ↵	Jan Provaznik	2019-09-10	1	-0/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'reprazent/gitlab-ce-bvl-find-correct-variables-for-testing-translations' into 'master' Build correct variables for testing translations Closes #48110 See merge request gitlab-org/gitlab-ce!32871
\| *	Build correct variables for testing translations	Bob Van Landuyt	2019-09-10	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes sure we build the correct variables for testing translations. When translating, we could be specifying the variables in different forms for each id: - In the singular we could be using a `%{hash}` interpolation - In the plural we could be using a `%d` interpolation This changes the tests to accommodate for that: We now use the variables used in the relevant translation id as the source for the variables we mix in in specs.
* \|	Start of fix for #21859, allow users to open files with newlines in the ↵	Jesse Hall	2019-09-10	1	-4/+66
\|/ \| \| \|	filenames.
*	Add event presenter	Jan Provaznik	2019-09-10	2	-1/+42
\| \| \| \| \|	This presenter will be used in an upcoming MR which adds rendering of epic events on group activity page.
*	Provide urls for Merge Requests and Issue links	Etienne Baqué	2019-09-10	1	-0/+46
\|
*	Merge branch 'issue-67127' into 'master'	Ash McKenzie	2019-09-10	1	-1/+2
\|\ \| \| \| \| \| \| \| \|	Expose :protected field for ../tags/:tag_name API endpoint See merge request gitlab-org/gitlab-ce!32790
\| *	Update API schema for Tag	Andrea Leone	2019-09-07	1	-1/+2
\| \|
* \|	Add approval MR rule to all_models.yml	mo khan	2019-09-09	1	-0/+1
\| \|
* \|	[CE backport] Fix usages of boards dropdown	Michael Kozono	2019-09-09	1	-30/+24
\| \|
* \|	Merge branch 'jivanvl-add-caret-icon-dashboard' into 'master'	Clement Ho	2019-09-09	1	-0/+47
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add caret icons to the monitoring dashboard See merge request gitlab-org/gitlab-ce!32239
\| * \|	Add caret icons to the monitoring dashboardjivanvl-add-caret-icon-dashboard	Jose Vargas	2019-09-09	1	-0/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The carets will function as a button that will allow the panels from the monitoring dashboard to collapse and show panels
* \| \|	Merge branch 'api_settings' into 'master'	Douglas Barbosa Alexandre	2019-09-09	1	-0/+38
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve application settings API Closes #58180 See merge request gitlab-org/gitlab-ce!31149
\| * \| \|	Settings API: domain_{black,white}list should be arrays	Mathieu Parent	2019-09-09	1	-0/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As in documentation. Fixes: #58180. Also remove the requirement between domain_blacklist_enabled and domain_blacklist.
* \| \| \|	Create new feature flagged UI for cloud providers	Enrique Alcántara	2019-09-09	5	-6/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Create HAML UI select a cloud provider to create a cluster. - Add query param to :new cluster view to display a specific cluster provider form depending on the value of the provider query param. - Update unit tests and e2e tests to reflect these changes
* \| \| \|	Expose update project service JSON endpoint	Peter Leitzen	2019-09-09	1	-42/+88
\| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Utilize `json_fields` to expose fields via `Service#as_json(only: json_fields)`.
* \| \|	Merge branch ↵	Clement Ho	2019-09-09	1	-0/+115
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'9102-hide-dismissed-vulnerabilities-in-the-group-security-dashboard-backport' into 'master' Add toggle to show/hide dismissed vulnerabilities (ports ee!15333) See merge request gitlab-org/gitlab-ce!32413
\| * \| \|	Backport "Add toggle to hide dismissed vulnerabilities"9102-hide-dismissed-vulnerabilities-in-the-group-security-dashboard-backport	Paul Gascou-Vaillancourt	2019-09-04	1	-0/+115
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15333
* \| \| \|	Improve performance and memory usage of project export	Kamil Trzciński	2019-09-09	5	-17/+399
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActiveModel::Serialization is simple in that it recursively calls `as_json` on each object to serialize everything. However, for a model like a Project, this can generate a query for every single association, which can add up to tens of thousands of queries and lead to memory bloat. To improve this, we can do several things: 1. We use `tree:` and `preload:` to automatically generate a list of all preloads that could be used to serialize objects in bulk. 2. We observe that a single project has many issues, merge requests, etc. Instead of serializing everything at once, which could lead to database timeouts and high memory usage, we take each top-level association and serialize the data in batches. For example, we serialize the first 100 issues and preload all of their associated events, notes, etc. before moving onto the next batch. When we're done, we serialize merge requests in the same way. We repeat this pattern for the remaining associations specified in import_export.yml.
* \| \| \|	Lower searches count limit	Francisco Javier López	2019-09-09	4	-11/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lowering the limit when performing search from 1001 to 101. This will allow us to speed this process.
* \| \| \|	Merge branch '61927-skeleton-pages-internal-api' into 'master'	Kamil Trzciński	2019-09-09	2	-0/+83
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add skeleton Pages internal API See merge request gitlab-org/gitlab-ce!32732
\| * \| \| \|	Add skeleton Pages internal API61927-skeleton-pages-internal-api	Krasimir Angelov	2019-09-06	2	-0/+83
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Basic `/internal/pages` endpoint that will be used for Pages virtual domains internal API. The endpoint is currently behind feature flag and provides authetication similar to how Workhorse is authenticating with the GitLab.
* \| \| \| \|	Passing job:rules downstream and E2E specs for job:rules configuration	drew	2019-09-09	3	-24/+353
\| \| \| \| \|
* \| \| \| \|	Merge branch 'events-delete-all' into 'master'	Lin Jen-Shin	2019-09-09	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use delete_all for deleting events See merge request gitlab-org/gitlab-ce!32751
\| * \| \| \|	Use delete_all for deleting eventsevents-delete-all	Jan Provaznik	2019-09-07	1	-1/+1
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because we don't have any destroy callbacks (or other logic triggered on event destroy), there is no reason for deleting events inefficiently one by one, instead we can use :delete_all.
* \| \| \|	Application Statistics API	Manoj MJ	2019-09-09	8	-1/+413
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change implements Application Statistics API
* \| \| \|	Merge branch 'kamil-refactor-import-structure' into 'master'	Stan Hu	2019-09-08	7	-236/+382
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Normalize import_export structure See merge request gitlab-org/gitlab-ce!32704
\| * \| \|	Normalize import_export structurekamil-refactor-import-structure	Kamil Trzciński	2019-09-06	7	-236/+382
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This brings a significant refactor to how we handle `import_export.yml`, merge it with EE and how we handle that for reader and saver. This is meant to simplify the code, and remove a ton of conditions to handle different models of the structure. This is also meant to prepare the structure to extend it much easier, like adding `preload:` or additional object types when needed. This does not change the behavior of import/export, rather unifies and simplifies the current implementation.
* \| \| \|	Allow to load ECDSA certificates for pages domains	Vladimir Shushlin	2019-09-07	3	-0/+155
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Just replace RSA.new with PKey.read
* \| \| \|	Merge branch 'sh-fix-captcha-state-pollution-spec' into 'master'	Mayra Cabrera	2019-09-06	1	-7/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix order-dependent spec failures with reCAPTCHA Closes #67133 See merge request gitlab-org/gitlab-ce!32771
\| * \| \| \|	Fix order-dependent spec failures with reCAPTCHAsh-fix-captcha-state-pollution-spec	Stan Hu	2019-09-06	1	-7/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	spec/controllers/registrations_controller_spec.rb polluted the test environment by changing the Recaptcha configuration. We now stub the controller's `verify_recaptcha` method instead of doing that. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/67133
* \| \| \| \|	Only show `/copy_metadata` when usable	Lee Tickett	2019-09-06	1	-0/+13
\| \| \| \| \|
* \| \| \| \|	Merge branch 'ac-accelerate-wiki-attachments' into 'master'	Nick Thomas	2019-09-06	3	-2/+80
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	accelerate wiki attachments See merge request gitlab-org/gitlab-ce!32663
\| * \| \| \| \|	Test blob_controller POST createac-accelerate-wiki-attachments	Alessio Caiazza	2019-09-06	1	-0/+38
\| \| \| \| \| \|
\| * \| \| \| \|	Process workhorse accelerated wiki uploads	Alessio Caiazza	2019-09-06	2	-2/+42
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wiki attachments can be workhorse accelerated. This commit is backward compatible with older workhorse
* \| \| \| \|	Fix sharing localStorage with all MRs	Igor	2019-09-06	3	-5/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose id field in the serializer in order to store comments content in the localStorage under the correct key
* \| \| \| \|	Merge branch 'fix-captcha-spec-state' into 'master'	Lin Jen-Shin	2019-09-06	1	-5/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix global state in registrations_controller_spec See merge request gitlab-org/gitlab-ce!32712
\| * \| \| \| \|	Fix global state in registrations_controller_specfix-captcha-spec-state	Yorick Peterse	2019-09-05	1	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This spec would mess with global state used for captchas, but not reset the state in all cases. This would then lead to the spec spec/controllers/snippets_controller_spec.rb failing, but only on a fork of gitlab-ee. To fix this we ensure the state is properly reset after running the specs that change this state.
* \| \| \| \| \|	Revert "Merge branch 'winh-fix-flaky-dashboard_spec' into 'master'"	Winnie Hellmann	2019-09-06	3	-190/+194
\| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !32571
* \| \| \| \|	Quote branch names in how to merge instructions	Lee Tickett	2019-09-06	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'sh-add-sidekiq-logging-for-bad-ci' into 'master'	Grzegorz Bizon	2019-09-06	1	-0/+14
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Log errors for failed pipeline creation in PostReceive See merge request gitlab-org/gitlab-ce!32633
\| * \| \| \| \|	Log errors for failed pipeline creation in PostReceivesh-add-sidekiq-logging-for-bad-ci	Stan Hu	2019-09-05	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a pipeline fails to create in `PostReceive`, the error is silently discarded, making it difficult to understand why a pipeline was not created. We now add a Sidekiq warning message for this. Adding a Sentry exception when this happens would generate a lot of noise for invalid CI files. Relates to https://gitlab.com/gitlab-org/gitlab-ee/issues/14720
* \| \| \| \| \|	Add new GitlabDanger class	Ash McKenzie	2019-09-06	2	-3/+125
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This class encapsulates our use of the Danger gem.
* \| \| \| \| \|	Merge branch '67032-add-projects-param-to-issuable-finder' into 'master'	Kamil Trzciński	2019-09-06	2	-1/+69
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add projects parameter to IssuableFinder Closes #67032 and gitlab-ee#10904 See merge request gitlab-org/gitlab-ce!32694
\| * \| \| \| \| \|	Add projects parameter to IssuableFinder	Lin Jen-Shin	2019-09-06	2	-1/+69
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'instance-group-level-knative' into 'master'	Grzegorz Bizon	2019-09-06	5	-226/+279
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Knative installation on group and instance level clusters Closes #62667 and #62666 See merge request gitlab-org/gitlab-ce!32128
\| * \| \| \| \| \| \|	Extract shared example from feature specsinstance-group-level-knative	Alishan Ladhani	2019-09-05	4	-670/+241
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For installing applications on a project/group/instance cluster
\| * \| \| \| \| \| \|	Enable Knative installation on group and instance level clusters	Alishan Ladhani	2019-09-05	3	-2/+484
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Show Knative install button on group/instance cluster pages - Allow Knative to be installed on group/instance clusters - Add feature specs for installing applications on group/instance clusters - Add changelog entry - Update docs to reflect that Knative can now be installed on group-level and instance-level clusters
* \| \| \| \| \| \|	Show weight on new board issue (CE-backport)	Winnie Hellmann	2019-09-06	2	-0/+28
\| \|_\|_\|/ / / \|/\| \| \| \| \|