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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Clarify 10k architecture resource per nodedocs-clarify-10k-architecture-resources-per-node	abuerer	2019-07-01	1	-5/+5
\| \| \| \|	Adding a note to the 10k reference architecturre that the resource recommendations are per node
*	Merge branch 'add-strategies-column-to-scopes-table' into 'master'	Andreas Brandl	2019-07-01	3	-1/+24
\|\ \| \| \| \| \| \| \| \|	Add Migration for Strategies Column on operations_feature_flag_scopes See merge request gitlab-org/gitlab-ce!29808
\| *	Add Migration for Strategies Column on operations_feature_flag_scopes	Jason Goodman	2019-07-01	3	-1/+24
\|/
*	Merge branch 'docs-fix-typo-in-docs' into 'master'	Stan Hu	2019-07-01	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Fix a typo in lib/gitlab/search/found_blob.rb See merge request gitlab-org/gitlab-ce!30219
\| *	Fix a typo in lib/gitlab/search/found_blob.rbdocs-fix-typo-in-docs	Rémy Coutable	2019-07-01	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch '9491-graphql-view-design-board-at-version-ce' into 'master'	Nick Thomas	2019-07-01	2	-0/+76
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	CE backport for "Show design boards at previous versions in GraphQL" See merge request gitlab-org/gitlab-ce!30151
\| * \|	CE backport for changes in EE MR 142929491-graphql-view-design-board-at-version-ce	Luke Duncalfe	2019-06-28	2	-0/+76
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	EE MR https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14292 https://gitlab.com/gitlab-org/gitlab-ee/issues/9491
* \| \|	Merge branch '63590-pipeline-actions-cause-full-refresh' into 'master'	Phil Hughes	2019-07-01	5	-10/+20
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Pipeline actions cause full refresh" Closes #63590 See merge request gitlab-org/gitlab-ce!30190
\| * \| \|	Fix pipelines table update after action63590-pipeline-actions-cause-full-refresh	shampton	2019-06-28	5	-10/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The pipelines table was showing the loading icon after the user cancelled or retried a pipeline. This fixes that so the pipeline updates without removing the table from the DOM.
* \| \| \|	Merge branch 'db-fixtures' into 'master'	Sean McGivern	2019-07-01	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	db.fixtures: use print instead of puts See merge request gitlab-org/gitlab-ce!30134
\| * \| \| \|	db.fixtures: use print instead of puts	eyjhbb@gmail.com	2019-06-27	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'mh/board-tooltips' into 'master'	Mike Greiling	2019-07-01	2	-2/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't show tooltips on Open and Closed boards Closes #63890 See merge request gitlab-org/gitlab-ce!30187
\| * \| \| \| \|	Don't show tooltips on Open and Closed boards	Martin Hanzel	2019-07-01	2	-2/+9
\|/ / / / /
* \| \| \| \|	Merge branch 'feature/uninstall_jupyter_hub_app' into 'master'	Mayra Cabrera	2019-07-01	6	-9/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow JupyterHub to be uninstalled See merge request gitlab-org/gitlab-ce!30097
\| * \| \| \| \|	Allow JupyterHub to be uninstalled	João Cunha	2019-07-01	6	-9/+13
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- enabled uninstallation - give it a specific uninstall message - ajust specs
* \| \| \| \|	Merge branch '50228-deploy-tokens-custom-username-docs' into 'master'	Marcia Ramos	2019-07-01	2	-1/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Deploy Tokens documentation See merge request gitlab-org/gitlab-ce!29737
\| * \| \| \| \|	Update Deploy Tokens documentation	Krasimir Angelov	2019-07-01	2	-1/+8
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update screenshot, add Deploy Token Custom Username section
* \| \| \| \|	Merge branch 'puma-init-restart' into 'master'	Kamil Trzciński	2019-07-01	4	-8/+42
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix cleanup of prometheus files on server start Closes #62862 See merge request gitlab-org/gitlab-ce!29788
\| * \| \| \| \|	Run do_master_restart callback on server start	Jan Provaznik	2019-07-01	4	-8/+42
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We want to call master_restart callback on start too - this callback is used for cleaning up prometheus files. It has been added to Omnibus already: https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/3350 So make sure that Unicorn example configs are up-to-date and that the same callback is called for Puma too.
* \| \| \| \|	Merge branch '62722-boot-app-in-ci-and-check-memory-ce' into 'master'	Kamil Trzciński	2019-07-01	4	-5/+41
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Get memory data after booting app in production Closes #62722 See merge request gitlab-org/gitlab-ce!30185
\| * \| \| \| \|	Get memory data after booting app in production62722-boot-app-in-ci-and-check-memory-ce	Aleksei Lipniagov	2019-06-28	4	-5/+41
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Preload the app in `production` env, hit it with a single request, and gather total gem memory consumption data using `derailed exec perf:mem` from `derailed_benchmarks`. Present the result as MR metrics.
* \| \| \| \|	Merge branch 'update-sidekiq-inline-testing-docs' into 'master'	Rémy Coutable	2019-07-01	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change docs to recommend perform_enqueued_jobs instead of Sidekiq::Testing.inline! See merge request gitlab-org/gitlab-ce!29845
\| * \| \| \| \|	Change docs to recommend perform_enqueued_jobsupdate-sidekiq-inline-testing-docs	rpereira2	2019-06-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Instead of Sidekiq::Testing.inline!, recommend the use of perform_enqueued_jobs. This is due to the changes in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20768
* \| \| \| \| \|	Merge branch 'divergence-graph-api-call' into 'master'	Filipa Lacerda	2019-07-01	6	-25/+83
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fetch branches divergence graph data through API call Closes #46139 See merge request gitlab-org/gitlab-ce!30068
\| * \| \| \| \| \|	Fetch branch diverging counts from API	Phil Hughes	2019-07-01	6	-25/+83
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/46139
* \| \| \| \| \|	Merge branch 'no-security-scan-for-docs-branches' into 'master'	Kamil Trzciński	2019-07-01	6	-55/+61
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No security scan for docs branches See merge request gitlab-org/gitlab-ce!30137
\| * \| \| \| \| \|	Refactor except code	Philippe Lafoucrière	2019-07-01	6	-55/+61
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We repeat the same code in many places. With the support of multiple extends, we can clean up several jobs.
* \| \| \| \| \|	Merge branch 'pl-qa-shell-flush-buffer' into 'master'	Ramya Authappan	2019-07-01	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QA: Make shellout more responsive See merge request gitlab-org/gitlab-ce!29798
\| * \| \| \| \| \|	QA: Make shellout more responsive	Peter Leitzen	2019-07-01	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid line-buffering and flush each character during shellout. This useful for commands (e.g. gcloud) which display its progress by printing single dots.
* \| \| \| \| \|	Merge branch 'vue-i18n-js-pipelines-directory' into 'master'	Kushal Pandya	2019-07-01	3	-4/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Vue-i18n: autofix for app/assets/javascripts/pipelines directory See merge request gitlab-org/gitlab-ce!30015
\| * \| \| \| \| \|	Vue-i18n: app/assets/javascripts/pipelines directoryvue-i18n-js-pipelines-directory	Ezekiel Kigbo	2019-07-01	3	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n linting for .vue files under the app/assets/javascripts/pipelines directory
* \| \| \| \| \| \|	Merge branch 'vue-i18n-js-pages-directory' into 'master'	Kushal Pandya	2019-07-01	4	-9/+54
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Vue-i18n: autofix for app/assets/javascripts/pages directory See merge request gitlab-org/gitlab-ce!29978
\| * \| \| \| \| \| \|	Moved feature access arrays to constantsvue-i18n-js-pages-directory	Ezekiel Kigbo	2019-07-01	3	-7/+41
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Vue-i18n: app/assets/javascripts/pages directory	Ezekiel Kigbo	2019-07-01	3	-7/+18
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n linting for .vue files under the app/assets/javascripts/pages directory
* \| \| \| \| \| \|	Merge branch 'test_schema_version_check_directly' into 'master'	Robert Speicher	2019-07-01	1	-7/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test schema_version_check directly Closes #63913 See merge request gitlab-org/gitlab-ce!30209
\| * \| \| \| \| \| \|	Test schema_version_check directlytest_schema_version_check_directly	Thong Kuah	2019-07-01	1	-7/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Testing via db:migrate causes side-effects like setting ActiveRecord::Base.configurations and also it runs schema dump into db/schema.rb. Rather than keep up, we test schema_version_check directly
* \| \| \| \| \| \| \|	Merge branch 'update-default_value_for-to-3-2-0' into 'master'	Nick Thomas	2019-07-01	2	-4/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update the 'default_value_for' gem to 3.2.0 Closes default_value_for#1 See merge request gitlab-org/gitlab-ce!30173
\| * \| \| \| \| \| \| \|	Update the 'default_value_for' gem to 3.2.0update-default_value_for-to-3-2-0	Rémy Coutable	2019-07-01	2	-4/+4
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'move-colon-on-merge-request-notification' into 'master'	Douwe Maan	2019-07-01	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move colon on merge request notification See merge request gitlab-org/gitlab-ce!30178
\| * \| \| \| \| \| \| \|	Move colon on merge request notification	George Tsiolis	2019-07-01	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-issue-63910' into 'master'	Sean McGivern	2019-07-01	3	-3/+45
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix attachments using the wrong URLs in e-mails Closes #63910 See merge request gitlab-org/gitlab-ce!30197
\| * \| \| \| \| \| \| \| \|	Fix attachments using the wrong URLs in e-mailssh-fix-issue-63910	Stan Hu	2019-06-28	3	-3/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/29889, only the project context were set for the Markdown renderer. For a note on an issuable, the group context was set to `nil` because `note.noteable.try(:group)` attempted to get the issuable's group, which doesn't exist. To make group notifications work, now both the project and group context are set. The context gets passed to `RelativeLinkFilter`, which previously assumed that it wasn't possible to have both a group and a project in the Markdown context. However, if a group were defined, it would take precedence, and the URL rendered for uploads would be `/group/-/uploads` instead of `/group/project/uploads/`. This led to 404s in e-mails. However, now that we have both project and group in the context, we render the Markdown giving priority to the project context if is set. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63910
* \| \| \| \| \| \| \| \| \|	Merge branch 'vue-i18n-js-serverless-directory' into 'master'	Filipa Lacerda	2019-07-01	4	-19/+65
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Vue-i18n: autofix for app/assets/javascripts/serverless directory See merge request gitlab-org/gitlab-ce!30016
\| * \| \| \| \| \| \| \| \| \|	Vue-i18n: app/assets/javascripts/serverless directory	Ezekiel Kigbo	2019-07-01	4	-19/+65
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n linting for .vue files under the app/assets/javascripts/serverless directory
* \| \| \| \| \| \| \| \| \|	Merge branch 'vue-i18n-various-js-directories' into 'master'	Filipa Lacerda	2019-07-01	6	-16/+31
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Vue-i18n: various js directories See merge request gitlab-org/gitlab-ce!29883
\| * \| \| \| \| \| \| \| \| \|	Vue-i18n: various js directories	Ezekiel Kigbo	2019-07-01	6	-16/+31
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n linting for .vue files under the directories: - app/assets/javascripts/error_tracking_settings - app/assets/javascripts/filtered_search - app/assets/javascripts/projects - app/assets/javascripts/releases - app/assets/javascripts/repository
* \| \| \| \| \| \| \| \| \|	Merge branch '44106-include-subgroups-in-group-activity' into 'master'	Bob Van Landuyt	2019-07-01	3	-4/+11
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include events from subgroups in group's activity Closes #44106 See merge request gitlab-org/gitlab-ce!29953
\| * \| \| \| \| \| \| \| \| \|	Revert "Include subgroups in shared_projects"	Fabian Schneider	2019-07-01	3	-4/+11
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 4bed2daef935bb4097988e0eff4830fc13a23c37.
* \| \| \| \| \| \| \| \| \|	Merge branch '63863-fix-groups-in-email-subject' into 'master'	Sean McGivern	2019-07-01	3	-22/+11
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove group in notification email subject Closes #63863 See merge request gitlab-org/gitlab-ce!30214
\| * \| \| \| \| \| \| \| \| \|	Remove group in notification email subject	Heinrich Lee Yu	2019-07-01	3	-22/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts to previous behavior where we have the group only when we don't have a project