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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Format `from` and `to` fields in JSON audit logsh-audit-event-json-log-format-from-and-to	Stan Hu	2019-07-11	3	-5/+38
\| \| \| \| \| \| \| \|	To make it possible to index the `from` and `to` fields with Elasticsearch and other tools, we need the types to be the same. Currently they are a mix of boolean and string values. Part of https://gitlab.com/gitlab-org/gitlab-ee/issues/12599
*	Merge branch '12557-tree-content' into 'master'	Douglas Barbosa Alexandre	2019-07-11	2	-1/+8
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Move EE differences for `app/views/projects/tree/_tree_content.html.haml` Closes gitlab-ee#12557 See merge request gitlab-org/gitlab-ce!30455
\| *	Moves method to TreeHelper	Filipa Lacerda	2019-07-11	2	-1/+8
\|/ \| \| \| \|	Reuses existing TreeHelper instead of creating a new one just for one method.
*	Merge branch 'ci-clean-up-reports-jobs' into 'master'	Mayra Cabrera	2019-07-11	2	-6/+7
\|\ \| \| \| \| \| \| \| \|	Clean up CI reports See merge request gitlab-org/gitlab-ce!30272
\| *	Clean up CI reports	Philippe Lafoucrière	2019-07-11	2	-6/+7
\|/ \| \| \| \|	Also, `SAST_CONFIDENCE_LEVEL` has been renamed in https://gitlab.com/gitlab-org/security-products/sast/merge_requests/72
*	Merge branch 'improve-chaos-controller' into 'master'	Stan Hu	2019-07-11	3	-46/+113
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add `db_spin` and refactor ChaosController Closes #64425 See merge request gitlab-org/gitlab-ce!30559
\| *	Add `db_spin` and refactor ChaosControllerimprove-chaos-controller	Kamil Trzciński	2019-07-11	3	-46/+113
\| \|
* \|	Merge branch '64388-remove-unused-code' into 'master'	Mayra Cabrera	2019-07-11	1	-4/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused method Closes #64388 See merge request gitlab-org/gitlab-ce!30576
\| * \|	Remove unused method	Ryan Cobb	2019-07-11	1	-4/+0
\|/ /
* \|	Merge branch 'qa/e2e-test-issue-comment' into 'master'63572-saml-authorize-screen-does-not-show-user-account	Walmyr	2019-07-11	3	-1/+42
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add end-to-end test for creating and editing issue comments See merge request gitlab-org/gitlab-ce!30571
\| * \|	Add new e2e test for adding and editing commentsqa/e2e-test-issue-comment	Walmyr Lima	2019-07-11	1	-0/+31
\| \| \| \| \| \| \| \| \| \| \| \|	...on issues.
\| * \|	Update page object with new element and method	Walmyr Lima	2019-07-11	1	-0/+10
\| \| \|
\| * \|	Update vue component with class for testability	Walmyr Lima	2019-07-11	1	-1/+1
\| \| \|
* \| \|	Merge branch '35757-move-issues-in-boards-pderichs' into 'master'	Jan Provaznik	2019-07-11	6	-11/+354
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add endpoint to move issues in boards See merge request gitlab-org/gitlab-ce!30216
\| * \| \|	Add endpoint to move multiple issues35757-move-issues-in-boards-pderichs	Patrick Derichs	2019-07-11	6	-11/+354
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add specs for new endpoint to move multiple issues. Add changelog entry Just check the first issue for the ability to move / update Add specs for exceeding limits and malformed requests Changed name of shared examples Change title of changelog entry Use %i instead of %w Check permission to update issue on project instead of board Use admin_issue permission to check for issue move ability Changed variable name to avoid shadow issue_params method Rename route to bulk_move Change route definition Check permissions for each issue Combine methods for parameters permit check Remove extra context Change description of context Check param for type Array Add unit tests to MoveService Use before_action for permission check Use set instead of let! Use let's instead of set
* \| \| \|	Merge branch '63667-hashed-storage-migration-count-correctly' into 'master'	Douglas Barbosa Alexandre	2019-07-11	5	-57/+118
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display the amount for Hashed Storage migration/rollback correctly Closes #63667 See merge request gitlab-org/gitlab-ce!29996
\| * \| \| \|	Display the amount for Hashed Storage migration/rollback correctly63667-hashed-storage-migration-count-correctly	Gabriel Mazetto	2019-07-10	4	-57/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rake script considers the specified range, if present, to calculate the affected amount of projects correctly.
\| * \| \| \|	Added the `abort_execution` matcher	Gabriel Mazetto	2019-07-10	1	-0/+46
\| \| \| \| \|
* \| \| \| \|	Merge branch '51575-remove-rails-4-specific-code-from-fromunion-from_union' ↵	Robert Speicher	2019-07-11	1	-5/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Remove Rails 4-specific code from `FromUnion.from_union` Closes #51575 See merge request gitlab-org/gitlab-ce!30587
\| * \| \| \| \|	Pass string directly to #from51575-remove-rails-4-specific-code-from-fromunion-from_union	Heinrich Lee Yu	2019-07-11	1	-5/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'gitaly-version-v1.53.0' into 'master'64440-limit-creation-of-the-alert-bot-in-usage-ping	Jan Provaznik	2019-07-11	2	-1/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Gitaly to v1.53.0 See merge request gitlab-org/gitlab-ce!30614
\| * \| \| \| \| \|	Upgrade Gitaly to v1.53.0	GitalyBot	2019-07-11	2	-1/+6
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs-fl-fe-guide' into 'master'	Achilleas Pipinellis	2019-07-11	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates frontend to Frontend See merge request gitlab-org/gitlab-ce!30631
\| * \| \| \| \| \|	Updates frontend to Frontend	Filipa Lacerda	2019-07-11	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docs-code-block-style-5' into 'master'	Achilleas Pipinellis	2019-07-11	21	-1032/+1058
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix whitespace in install and integration docs See merge request gitlab-org/gitlab-ce!30600
\| * \| \| \| \| \|	Fix whitespace in install and integration docs	Marcel Amirault	2019-07-11	21	-1032/+1058
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Many code blocks are 4spaced, and they render in GitLab without coloring as a result, even though they are fenced with a language label. If in a list, other items will render as being in a code block too, even if not meant to. This fixes all these issues, and cleans up minor white space issues in install and integration docs
* \| \| \| \| \|	Merge branch '64091-fix-broken-terminal' into 'master'	Filipa Lacerda	2019-07-11	2	-0/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken environments terminal See merge request gitlab-org/gitlab-ce!30401
\| * \| \| \| \| \|	Load terminal css file in environments page	Jacques Erasmus	2019-07-11	2	-0/+8
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Loaded the xterm css file in order to fix the styling issues
* \| \| \| \| \|	Merge branch '63691-fix-doc-link' into 'master'	Filipa Lacerda	2019-07-11	2	-1/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct link to external_dashboard doc See merge request gitlab-org/gitlab-ce!30019
\| * \| \| \| \| \|	Correct link to external_dashboard doc	Reuben Pereira	2019-07-11	2	-1/+6
\|/ / / / / /
* \| \| \| \| \|	Merge branch '490-enable-puma-by-default-in-GDK' into 'master'	Grzegorz Bizon	2019-07-11	3	-57/+73
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable puma by default in GDK Closes gitlab-development-kit#490 See merge request gitlab-org/gitlab-ce!30285
\| * \| \| \| \| \|	Enable puma by default in GDK490-enable-puma-by-default-in-GDK	Qingyu Zhao	2019-07-09	3	-57/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Two changes: 1. Move bin/web to bin/web_unicorn(removed PUMA switching logic) Introduce new shadow script bin/web. Now we have 3 scripts working together: bin/web, bin/web_puma, bin/web_unicorn In bin/web, it checks ENV['USE_WEB_SERVER']: - if value is 'puma' or value is not set, call bin/web_puma - if value is 'unicorn', call bin/web_unicorn - report error if other values given 2. Gitlab rails allow ENV setting to override timeout - ENV['GITLAB_RAILS_RACK_TIMEOUT'] for service_timeout - ENV['GITLAB_RAILS_WAIT_TIMEOUT'] for wait_timeout
* \| \| \| \| \| \|	Merge branch '64161-gitlab-fqdn' into 'master'	Grzegorz Bizon	2019-07-11	5	-0/+13
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add CI variable to provide GitLab FQDN Closes #64161 See merge request gitlab-org/gitlab-ce!30417
\| * \| \| \| \| \|	Add docs about CI_SERVER_HOST env variable64161-gitlab-fqdn	Balasankar "Balu" C	2019-07-10	2	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
\| * \| \| \| \| \|	Add CI variable to provide GitLab FQDN	Balasankar "Balu" C	2019-07-10	3	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* \| \| \| \| \| \|	Merge branch 'docs-add-reconfigure-to-restore' into 'master'	Achilleas Pipinellis	2019-07-11	1	-1/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add reconfigure step to secrets restoration See merge request gitlab-org/gitlab-ce!30617
\| * \| \| \| \| \| \|	Add reconfigure step to secrets restorationdocs-add-reconfigure-to-restore	Alexander Tanayno	2019-07-11	1	-1/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'docs-markdown-for-administration-plantuml' into 'master'	Achilleas Pipinellis	2019-07-11	1	-2/+3
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Markdown example for PlantUML docs See merge request gitlab-org/gitlab-ce!30513
\| * \| \| \| \| \| \|	Fix Markdown example for PlantUML docs	Takuya Noguchi	2019-07-11	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'registry-fix-multi-delete-modal' into 'master'	Kushal Pandya	2019-07-11	5	-15/+13
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set unique modal IDs See merge request gitlab-org/gitlab-ce!30532
\| * \| \| \| \| \| \| \|	Set unique modal IDsregistry-fix-multi-delete-modal	Paul Gascou-Vaillancourt	2019-07-09	5	-15/+13
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix-issue-trackers-spec' into 'master'	Thong Kuah	2019-07-11	7	-12/+36
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure all specs run properly See merge request gitlab-org/gitlab-ce!30367
\| * \| \| \| \| \| \| \| \|	Make sure all specs run properly	Jarka Košanová	2019-07-11	7	-12/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- handling properties needs to be skipped when creating test records in order to test the legacy data
* \| \| \| \| \| \| \| \| \|	Merge branch 'hfy/apply-knative-cluster-role-on-service-account-creation' ↵	Achilleas Pipinellis	2019-07-11	13	-15/+161
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Create Knative role and binding with service account See merge request gitlab-org/gitlab-ce!30235
\| * \| \| \| \| \| \| \| \| \|	Give Knative serving permissions to service account	Hordur Freyr Yngvason	2019-07-11	13	-15/+161
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab uses a kubernetes service account to perform deployments. For serverless deployments to work as expected with externally created clusters with their own knative installations (e.g. via Cloud Run), this account requires additional permissions in the serving.knative.dev API group.
* \| \| \| \| \| \| \| \| \|	Merge branch 'winh-jest-config-node-10' into 'master'	Kushal Pandya	2019-07-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace path with filename in Jest config Closes #64429 See merge request gitlab-org/gitlab-ce!30608
\| * \| \| \| \| \| \| \| \|	Replace path with filename in Jest config	Winnie Hellmann	2019-07-11	1	-1/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '61145-fix-button-dimensions' into 'master'	Phil Hughes	2019-07-11	15	-89/+98
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bring buttons up to design spec Closes #61146, #61144, and #61145 See merge request gitlab-org/gitlab-ce!28545
\| * \| \| \| \| \| \| \| \|	Bring buttons style up to design spec	Scott Hampton	2019-07-11	15	-89/+98
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a CSS effort only. Fixes the padding of the buttons to be `8px 12px` (including border) so that the button height is 32px. Also adjusts the border width for all buttons when the state is `hover`, `focus`, or `active to be 2px thick instead of 1px thick. This is accomplished through an inset box-shadow as not to increase the size of the button. Fixes some colors for primary and tertiary buttons.
* \| \| \| \| \| \| \| \|	Merge branch 'docs-crosslink-prometheus-grafana-in-ha-monitoring' into 'master'	Achilleas Pipinellis	2019-07-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Crosslink Prometheus and Grafana to HA monitoring Closes #63419 See merge request gitlab-org/gitlab-ce!30588