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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add 2 new indexes, corrected version + schema.rb #50169nik-new-indexes-ci	NikolayS	2018-09-12	2	-3/+5
\|
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into nik-new-indexes-ci	NikolayS	2018-09-12	32	-3148/+284
\|\
\| *	Merge branch 'clean-gitlab-git' into 'master'	Douwe Maan	2018-09-12	32	-3148/+284
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Rugged and shell code from Gitlab::Git Closes gitaly#1124 See merge request gitlab-org/gitlab-ce!21488
\| \| *	Remove Rugged and shell code from Gitlab::Git	Alejandro Rodríguez	2018-09-12	32	-3148/+284
\| \| \|
* \| \|	Add 2 new indexes to speedup a query on ci_builds, ci_pipelines #50169	NikolayS	2018-09-12	1	-0/+30
\|/ /
* \|	Merge branch 'fix-mention-in-edit-mr' into 'master'	Robert Speicher	2018-09-12	4	-2/+26
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix mention in edit mr Closes #50608 See merge request gitlab-org/gitlab-ce!21696
\| * \|	Fix mention in edit mr	Alin Ciciu	2018-09-12	4	-2/+26
\|/ /
* \|	Merge branch 'issue_50528' into 'master'	Stan Hu	2018-09-12	3	-1/+35
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Log project services sidekiq failures Closes #50528 See merge request gitlab-org/gitlab-ce!21336
\| * \|	Log project services errors when executing async	Felipe Artur	2018-09-10	3	-1/+35
\| \| \|
* \| \|	Merge branch 'use-gitlab-ui-pagination-for-groups' into 'master'	Clement Ho	2018-09-12	6	-15/+127
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use GitLab UI pagination component for groups See merge request gitlab-org/gitlab-ce!21287
\| * \| \|	Use GitLab ui pagination component for groups	Adriel Santiago	2018-09-11	6	-15/+127
\| \| \| \|
* \| \| \|	Merge branch 'update-gitlab-shell' into 'master'	Stan Hu	2018-09-12	2	-1/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab shell See merge request gitlab-org/gitlab-ce!21701
\| * \| \| \|	Update GitLab Shell to v8.3.2	Nick Thomas	2018-09-12	2	-1/+6
\|/ / / /
* \| \| \|	Merge branch 'code_review-assign-maintainers-different-team' into 'master'	Douwe Maan	2018-09-12	1	-2/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update code_review.md to include a recommendation for assigning maintainers from different teams See merge request gitlab-org/gitlab-ce!21644
\| * \| \| \|	Update code_review.md to include a recommendation for assigning maintainers ↵	Luke Bennett	2018-09-12	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	from different teams Improve recommended maintainer docs
* \| \| \| \|	Merge branch 'initialize-projects-with-readme' into 'master'	Douwe Maan	2018-09-12	4	-0/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Initialize projects with readme See merge request gitlab-org/gitlab-ce!21617
\| * \| \| \| \|	Initialize projects with readme	Steve	2018-09-12	4	-0/+15
\|/ / / / /
* \| \| \| \|	Merge branch '51200-markdown-footnotes-don-t-render-when-inside-a-table' ↵	Douwe Maan	2018-09-12	2	-1/+18
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Markdown footnotes don't render when inside a table..." Closes #51200 See merge request gitlab-org/gitlab-ce!21675
\| * \| \| \| \|	Updated commonmarker gem to 0.17.13	Brett Walker	2018-09-11	2	-1/+18
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'bjk/49849_node_metrics_update' into 'master'	Stan Hu	2018-09-12	1	-4/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update example Prometheus queries Closes #49849 See merge request gitlab-org/gitlab-ce!21695
\| * \| \| \| \| \|	Update example Prometheus queries	Ben Kochie	2018-09-12	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Update metric names to match current release. * Improve descriptions. * Improve examples to show more query language functionality. Memory: * Show use of `or` function. * Automatically select "MemAvailable" kernel metric if possible. CPU: * Show use of `avg without ...`. * Show CPU utilization per node. Network: * Show use of `!=` label matching. * Don't show "localhost" metrics.
* \| \| \| \| \| \|	Merge branch '50989-add-trigger-information-to-job-api' into 'master'	Kamil Trzciński	2018-09-12	8	-2/+99
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add trigger information for job API Closes #50989 See merge request gitlab-org/gitlab-ce!21495
\| * \| \| \| \| \| \|	Add trigger information for job API	Steve Azzopardi	2018-09-12	8	-2/+99
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create new entity called TriggerVariablesEnitity for trigger variables, to aid reuseablity in the future. Update JSON schema to include trigger information in the response. Refactor rspec tests a bit to reduce duplication and for the `context` to make sense. closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50989
* \| \| \| \| \| \|	Merge branch 'dz-add-project-id-to-jupyter' into 'master'	Dmitriy Zaporozhets	2018-09-12	2	-0/+22
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add GitLab project id to jupyter config installed via cluster apps See merge request gitlab-org/gitlab-ce!21341
\| * \| \| \| \| \|	Add cluster project id to jupyter config	Dmitriy Zaporozhets	2018-08-22	2	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch ↵	Stan Hu	2018-09-12	2	-9/+11
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'51271-error-500-due-to-encoding-issues-when-when-attempting-to-access-issues-api' into 'master' Resolve "Error 500 due to encoding issues when when attempting to access issues API" Closes #51271 See merge request gitlab-org/gitlab-ce!21680
\| * \| \| \| \| \|	'code_block' closer to original implementation	Brett Walker	2018-09-11	2	-9/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- utilize the 'out' method to output the 'fence_info', which converts to utf8 - output 'sourcepos' again
* \| \| \| \| \| \|	Merge branch 'sh-allow-key-id-in-params' into 'master'	Robert Speicher	2018-09-11	2	-3/+7
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Filter any parameters ending with "key" in logs See merge request gitlab-org/gitlab-ce!21688
\| * \| \| \| \| \|	Filter any parameters ending with "key" in logs	Stan Hu	2018-09-11	2	-3/+7
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails does a partial match for strings in the filter_parameters configuration, so the parameter "key" causes "key_id" to be filtered even though it's a useful parameter for debugging internal API issues. We now revise this filter to make any parameter ending with "key" is filtered. Relates to https://gitlab.com/gitlab-com/gl-infra/production/issues/463
* \| \| \| \| \|	Merge branch 'add-gitlab-ui-loading-icon' into 'master'	Mike Greiling	2018-09-11	65	-305/+89
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitlab-ui loading icon See merge request gitlab-org/gitlab-ce!21659
\| * \| \| \| \| \|	Use gitlab-ui loading icon	Clement Ho	2018-09-11	65	-305/+89
\|/ / / / / /
* \| \| \| \| \|	Merge branch '50677-fix-cherry-pick-branch-empty-name' into 'master'	Robert Speicher	2018-09-11	7	-14/+27
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "500 Internal Server Error: Cherrypick commit with empty branch name" Closes #50677 See merge request gitlab-org/gitlab-ce!21501
\| * \| \| \| \| \|	Resolve "500 Internal Server Error: Cherrypick commit with empty branch name"	🙈 jacopo beschi 🙉	2018-09-11	7	-14/+27
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'winh-karma-junit' into 'master'	Mike Greiling	2018-09-11	7	-6/+31
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generate JUnit report for Karma tests See merge request gitlab-org/gitlab-ce!21473
\| * \| \| \| \| \|	Generate JUnit report for Karma tests	Winnie Hellmann	2018-09-11	7	-6/+31
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'use-bootstrap-4.1.1' into 'master'	Mike Greiling	2018-09-11	2	-4/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explicitly use bootstrap 4.1.1 Closes #51362 See merge request gitlab-org/gitlab-ce!21683
\| * \| \| \| \| \|	Explicitly use bootstrap 4.1.1	Clement Ho	2018-09-11	2	-4/+8
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'remove-unused-import' into 'master'	Mike Greiling	2018-09-11	1	-4/+0
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused GlModal import in delete wiki modal See merge request gitlab-org/gitlab-ce!21677
\| * \| \| \| \|	Remove unused GlModal import in delete wiki modal	Clement Ho	2018-09-11	1	-4/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '51375-fix-activity-pages' into 'master'	Robert Speicher	2018-09-11	2	-1/+36
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the group and project activity pages Closes #51375 See merge request gitlab-org/gitlab-ce!21674
\| * \| \| \| \|	Fix the group and project activity pages	Nick Thomas	2018-09-11	2	-1/+36
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '51112-add-status-illustration-in-job-api' into 'master'	Kamil Trzciński	2018-09-11	13	-31/+77
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add empty state illustration information in job API Closes #51112 See merge request gitlab-org/gitlab-ce!21532
\| * \| \| \| \| \|	Add empty state illustration information in job API	Steve Azzopardi	2018-09-11	13	-31/+77
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'rails5-deprecation-warnings-ce' into 'master'	Robert Speicher	2018-09-11	4	-13/+21
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Fix rails 5 deprecation warnings See merge request gitlab-org/gitlab-ce!21673
\| * \| \| \| \|	Fix rails 5 deprecation warnings	Jan Provaznik	2018-09-11	4	-13/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes rails 5 deprecation warnings in `config/` files
* \| \| \| \| \|	Merge branch '50632-combine-color-duplicates' into 'master'	Clement Ho	2018-09-11	29	-254/+59
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "[SCSS Variables Cleanup] Combine all duplicated hex colors in variables.scss", Part 1 See merge request gitlab-org/gitlab-ce!21375
\| * \| \| \| \| \|	Remove jquery.scss; Combine multiple duplicate grays into global gray ↵	Annabel Dunstone Gray	2018-09-11	29	-254/+59
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	variables; Remove unused styles in common.scss
* \| \| \| \| \| \|	Merge branch 'frozen-string-enable-vestigial' into 'master'	Stan Hu	2018-09-11	5	-0/+13
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable frozen string in vestigial files See merge request gitlab-org/gitlab-ce!21665
\| * \| \| \| \| \| \|	Enable frozen string in vestigial files	gfyoung	2018-09-11	5	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Partially addresses #47424.
* \| \| \| \| \| \| \|	Merge branch '51333-use-rails-root-for-common-metrics-importer' into 'master'	Grzegorz Bizon	2018-09-11	2	-2/+12
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Rails.root for CommonMetricsImporter Closes #51333 See merge request gitlab-org/gitlab-ce!21664