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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| * \| \| \| \|	Crosslink prometheus and grafana to HA monitoringdocs-crosslink-prometheus-grafana-in-ha-monitoring	abuerer	2019-07-10	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'chriscool-master-patch-19677' into 'master'	Achilleas Pipinellis	2019-07-11	1	-1/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update doc/ci/yaml/README.md Closes #58636 See merge request gitlab-org/gitlab-ce!30516
\| * \| \| \| \| \|	Add --push-option example in doc/ci/yaml/README.mdchriscool-master-patch-19677	Christian Couder	2019-07-10	1	-1/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'z-index-tools' into 'master'	Phil Hughes	2019-07-11	2	-0/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Review Tools: Add large z-index to toolbar See merge request gitlab-org/gitlab-ce!30583
\| * \| \| \| \| \| \|	Review Tools: Add large z-index to toolbar	Sarah Groff Hennigh-Palermo	2019-07-11	2	-0/+6
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'chriscool-master-patch-11367' into 'master'	Achilleas Pipinellis	2019-07-11	1	-1/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update doc/user/project/merge_requests/index.md See merge request gitlab-org/gitlab-ce!30517
\| * \| \| \| \| \| \|	Update push option note in merge_requests/index.mdchriscool-master-patch-11367	Christian Couder	2019-07-10	1	-1/+2
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'better-merge-train-exlusive-lock-ce' into 'master'	Kamil Trzciński	2019-07-11	2	-0/+259
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Port: Fix race condition on merge train with better exclusive lock See merge request gitlab-org/gitlab-ce!30352
\| * \| \| \| \| \| \|	Efficient merge train locksbetter-merge-train-exlusive-lock-ce	Shinya Maeda	2019-07-11	2	-0/+259
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Efficient merge train locks with Sequential Process helper.
* \| \| \| \| \| \| \|	Merge branch 'banzai-avoid-redis-if-db-cache' into 'master'	Douwe Maan	2019-07-11	12	-48/+194
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Banzai - avoid redis if attr is in DB cache See merge request gitlab-org/gitlab-ce!30334
\| * \| \| \| \| \| \| \|	Banzai - avoid redis if attr is in DB cachebanzai-avoid-redis-if-db-cache	Mario de la Ossa	2019-07-10	12	-48/+194
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When cache_collection_render runs we end up reading and writing things to redis even if we already have the rendered field cached in the DB. This commit avoids using redis at all whenever we have the field already rendered in the DB cache.
* \| \| \| \| \| \| \| \|	Merge branch 'mw-project-list-color-fix' into 'master'	Kushal Pandya	2019-07-11	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project list: Add text-secondary to controls container See merge request gitlab-org/gitlab-ce!30567
\| * \| \| \| \| \| \| \| \|	Add text-secondary to controls container	Martin Wortschack	2019-07-11	2	-1/+6
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add changelog entry
* \| \| \| \| \| \| \| \|	Merge branch '64314-ci-icon' into 'master'	Kushal Pandya	2019-07-11	4	-12/+17
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Align CI icon in merge request dashboard Closes #64314 See merge request gitlab-org/gitlab-ce!30558
\| * \| \| \| \| \| \| \| \|	Align items in merge request dashboard64314-ci-icon	Filipa Lacerda	2019-07-10	4	-12/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Vertically aligns ci icon, avatar, and comments icons in the merge request dashboard by using flex
* \| \| \| \| \| \| \| \| \|	Merge branch 'issue_57694' into 'master'	Sean McGivern	2019-07-11	8	-0/+670
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve Graphql Docs Closes #57694 See merge request gitlab-org/gitlab-ce!29998
\| * \| \| \| \| \| \| \| \| \|	Improve Graphql Docs	Felipe Artur	2019-07-11	8	-0/+670
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds more friendly docs for GraphQl implementation
* \| \| \| \| \| \| \| \| \|	Merge branch 'bvl-link-phab-users' into 'master'	James Lopez	2019-07-11	17	-21/+500
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fetch users from Phabricator + link to issues Closes #60565 See merge request gitlab-org/gitlab-ce!30321
\| * \| \| \| \| \| \| \| \|	Fetch users from Phabricator to link to issues	Bob Van Landuyt	2019-07-10	17	-21/+500
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We fetch the users from Phabricator based on their Phabricator ID. If a user with the same username exists and is a member of the project, we set them as assignee or author. When a user is applicable, we also cache it in Redis so we don't have to perform the request again for the same phid.
* \| \| \| \| \| \| \| \| \|	Merge branch '62088-search-back' into 'master'	Mike Greiling	2019-07-11	6	-4/+102
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed back navigation for projects filter Closes #62088 See merge request gitlab-org/gitlab-ce!30373