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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'qa/quarantine-filter-issue-comments-test' into 'master'	Walmyr Lima e Silva Filho	2019-08-23	1	-1/+2
\|\ \| \| \| \| \| \| \| \|	Quarantine filter issue comments test See merge request gitlab-org/gitlab-ce!32152
\| *	Quarantine filter issue comments testqa/quarantine-filter-issue-comments-test	Walmyr Lima	2019-08-23	1	-1/+2
\| \|
* \|	Merge branch 'docs-health-check-failure-examples' into 'master'	Achilleas Pipinellis	2019-08-23	1	-13/+69
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs health check failure examples Closes #64193 See merge request gitlab-org/gitlab-ce!31945
\| * \|	Docs health check failure examples	Sean Arnold	2019-08-23	1	-13/+69
\|/ /
* \|	Merge branch '57402-upate-issues-list-sort-options-ce' into 'master'	Jan Provaznik	2019-08-23	8	-23/+49
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	CE: Update sort options for issues list See merge request gitlab-org/gitlab-ce!31849
\| * \|	Update sort options for issues list57402-upate-issues-list-sort-options-ce	Alexandru Croitor	2019-08-23	8	-23/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase sort options for issues list from updated_at and create_at, to include more options close to what is required in actual issue list UI. This helps us to use REST API for issues list with sorting capabilities https://gitlab.com/gitlab-org/gitlab-ce/issues/57402
* \| \|	Merge branch 'qa-ml-fail-early-if-template-not-found' into 'master'	Walmyr Lima e Silva Filho	2019-08-23	2	-2/+15
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Fail E2E tests early if template not found via API See merge request gitlab-org/gitlab-ce!31955
\| * \|	Fail E2E tests early if template not found via API	Mark Lapierre	2019-08-23	2	-2/+15
\|/ /
* \|	Merge branch '62514-update-prometheus-metrics-docs' into 'master'	Achilleas Pipinellis	2019-08-23	1	-33/+110
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	62514 - update prometheus metrics docs Closes #62514 See merge request gitlab-org/gitlab-ce!31987
\| * \|	62514 - update prometheus metrics docs	David Wilkins	2019-08-23	1	-33/+110
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Strikeout for metrics that aren't reported anymore - added :thumbsup: for all the metrics that appear to be still available - Added :new: for the new metrics. - Determine Release when the new metrics appeared - Add descriptions for the new metrics - remove the adornments :new: and :thumbsup: - removce the lines with strikeout
* \|	Merge branch 'master' into 'master'	Stan Hu	2019-08-23	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Reduce dedup calls to gc only See merge request gitlab-org/gitlab-ce!32083
\| * \|	Reduce dedup calls to gc only	Boris Krylov	2019-08-22	1	-1/+1
\| \| \|
* \| \|	Merge branch 'winh-deduplicate-board-headers' into 'master'	Kushal Pandya	2019-08-23	6	-6/+43
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide duplicate board list while dragging See merge request gitlab-org/gitlab-ce!32099
\| * \| \|	Hide duplicate board list while dragging	Winnie Hellmann	2019-08-23	6	-6/+43
\|/ / /
* \| \|	Merge branch 'docs-12713-vulnerabilities-dl-api' into 'master'	Achilleas Pipinellis	2019-08-23	1	-5/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update dependencies api doc See merge request gitlab-org/gitlab-ce!32061
\| * \| \|	Update dependencies api doc	Tetiana Chupryna	2019-08-23	1	-5/+11
\|/ / /
* \| \|	Merge branch 'ac-uploads-docs' into 'master'	Nick Thomas	2019-08-23	3	-0/+274
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document uploads development guidelines Closes #63097 See merge request gitlab-org/gitlab-ce!31290
\| * \| \|	Document uploads development guidelines	Alessio Caiazza	2019-08-23	3	-0/+274
\|/ / / \| \| \| \| \| \| \| \| \|	Explain Workhorse acceleration features
* \| \|	Merge branch 'frozen_string_lib_2' into 'master'	Nick Thomas	2019-08-23	201	-3/+401
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add frozen_string_literal to lib part 2 See merge request gitlab-org/gitlab-ce!32094
\| * \| \|	Fix frozen string errorfrozen_string_lib_2	Thong Kuah	2019-08-23	1	-1/+2
\| \| \| \|
\| * \| \|	Fix frozen string errors	Thong Kuah	2019-08-23	2	-2/+2
\| \| \| \|
\| * \| \|	Add frozen_string_literal to lib part 2	Thong Kuah	2019-08-23	199	-0/+397
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using the sed script from https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
* \| \| \|	Merge branch '66022-git-clone-url-box-on-wiki-git-access-page-is-broken' ↵	Annabel Dunstone Gray	2019-08-23	9	-38/+29
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Git clone URL box on Wiki git access page is broken" Closes #66022 See merge request gitlab-org/gitlab-ce!31898
\| * \| \| \|	Fix broken git clone box on wiki git access page	Himanshu Kapoor	2019-08-23	9	-38/+29
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some CSS fixes to fix the position of the git clone box on the wiki git access page. This fix also includes fixes for various responsive states.
* \| \| \|	Merge branch '64385-charts-scroll-handle-icon-has-disappeared' into 'master'	Filipa Lacerda	2019-08-23	3	-1/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix charts scroll handle icon See merge request gitlab-org/gitlab-ce!31825
\| * \| \| \|	fix charts scroll handle icon	Laura Montemayor	2019-08-23	3	-1/+14
\|/ / / /
* \| \| \|	Merge branch 'labkit-cache-tracing' into 'master'	Nick Thomas	2019-08-23	4	-4/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Redis interceptor tracing See merge request gitlab-org/gitlab-ce!30238
\| * \| \| \|	Add cache tracing and Redis tracing	Andrew Newdigate	2019-08-23	4	-4/+14
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change adds Distributed Tracing support for two new types of events 1. Redis Calls 1. ActiveSupport (Rails) Caching Operations The intention is to help application developers and infrastructure SREs to understand the pressure that caching operations can have on the application when running at scale. The Redis and Caching spans can be viewed in the Jaeger UI by clicking the "Trace" link in the performance bar when running on GDK.
* \| \| \|	Merge branch 'optimise-build-queue-service' into 'master'	Grzegorz Bizon	2019-08-23	5	-51/+103
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimise UpdateBuildQueueService Closes #66438 See merge request gitlab-org/gitlab-ce!32095
\| * \| \| \|	Optimise build queue serviceoptimise-build-queue-service	Kamil Trzciński	2019-08-22	5	-51/+103
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes BuildQueueService to force refresh runners that are considered to have recent queue. Such runners are the ones that connected within online interval + time to expire runner cache.
* \| \| \| \|	Merge branch 'docs-65631-rename-approval-rule' into 'master'	Achilleas Pipinellis	2019-08-23	3	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update documentation screenshot See merge request gitlab-org/gitlab-ce!31995
\| * \| \| \| \|	Update documentation screenshot	Samantha Ming	2019-08-23	3	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'v12-upgrade-recommendation-docs' into 'master'	Achilleas Pipinellis	2019-08-23	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add version 12 upgrade recommendations Closes #63907 See merge request gitlab-org/gitlab-ce!30201
\| * \| \| \| \|	Add version 12 upgrade recommendations	Greg Myers	2019-08-23	1	-0/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates doc/policy/maintenance.md, adds upgrade path from 11 -> 12
* \| \| \| \|	Merge branch 'docs-capitalization-1' into 'master'	Achilleas Pipinellis	2019-08-23	24	-43/+43
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update capitalization in /administration, /api, others See merge request gitlab-org/gitlab-ce!32136
\| * \| \| \|	Update capitalization in admin, api, others	Marcel Amirault	2019-08-23	24	-43/+43
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update capitalization in /administration, /api, /ci and /customization
* \| \| \|	Merge branch ↵	Jan Provaznik	2019-08-23	3	-3/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'49392-exempt-jwt-auth-for-user-gitlab-ci-token-from-rate-limiting' into 'master' Exempt `jwt/auth` for user `gitlab-ci-token` from rate limiting Closes #49392 See merge request gitlab-org/gitlab-ce!31909
\| * \| \| \|	Exempt `jwt/auth` for user `gitlab-ci-token` from rate limiting	Marius Bobin	2019-08-23	3	-3/+12
\|/ / / /
* \| \| \|	Merge branch 'qa-ml-fix-view-commit-patch-test' into 'master'	Sanad Liaquat	2019-08-23	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Failure in qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb" Closes gitlab-org/quality/staging#69 See merge request gitlab-org/gitlab-ce!32087
\| * \| \| \|	Fix failing testqa-ml-fix-view-commit-patch-test	Mark Lapierre	2019-08-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optionally check for quotes and escape the name
* \| \| \| \|	Merge branch 'respect-user-do-not-track' into 'master'	Kushal Pandya	2019-08-23	2	-1/+34
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add logic for respecting browser DNT setting See merge request gitlab-org/gitlab-ce!32030
\| * \| \| \| \|	Add logic for respecting browser DNT setting	Jeremy Jackson	2019-08-23	2	-1/+34
\|/ / / / /
* \| \| \| \|	Merge branch '51470-webide-default-commit' into 'master'	Paul Slaughter	2019-08-22	19	-262/+619
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "WebIDE Default Commit options" Closes #51470 See merge request gitlab-org/gitlab-ce!31449
\| * \| \| \| \|	Always pre-select "Start a new merge request"	Denys Mishunov	2019-08-22	19	-262/+619
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	One exception: there is an existing MR for the current branch and the branch is non-default and non-protected. Extended mock_data for ide/stores to have different types of branches: default, protected and regular Cleaned new MR checkbox view
* \| \| \| \|	Merge branch '59053-no-oauth-for-cicd-github-fe' into 'master'	Mayra Cabrera	2019-08-22	6	-37/+44
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Mirroring for external CI/CD repositories should not store OAuth token" See merge request gitlab-org/gitlab-ce!31488
\| * \| \| \| \|	Update GitHub CI/CD import page to use PAT only	Scott Hampton	2019-08-22	6	-37/+44
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Oauth2 tokens are causing issues with mirroring repos, because it effectively limits the number of repos you can mirror. Personal Access Tokens do not have this problem. This change removes the OAuth2 option from the import page for CI/CD only, and only provides the personal access token form.
* \| \| \| \|	Merge branch 'ml-update-qa-readme-docs' into 'master'	Mark Lapierre	2019-08-22	1	-0/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update QA readme to note that Chrome/Chromium is required See merge request gitlab-org/gitlab-ce!32035
\| * \| \| \| \|	Update QA readme to note that Chrome/Chromium is required	Mark Lapierre	2019-08-22	1	-0/+5
\|/ / / / /
* \| \| \| \|	Merge branch 'sh-revert-redis-cache-store' into 'master'	Mayra Cabrera	2019-08-22	2	-4/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix "ERR value is not an integer or out of range" errors Closes #66449 See merge request gitlab-org/gitlab-ce!32126
\| * \| \| \| \|	Fix "ERR value is not an integer or out of range" errors	Stan Hu	2019-08-22	2	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`ActiveSupport::Cache::RedisCacheStore` is not compatible with the version of Rack Attack we are using (v4.4.1) per https://github.com/kickstarter/rack-attack/issues/281. Users that had rate limits enabled might see `Redis::CommandError: ERR value is not an integer or out of range` because the `raw` parameter wasn't passed along properly. As a result, the Rack Attack entry would be stored as an `ActiveSupport::Cache::Entry` instead of a raw string holding an integer value. Let's partially revert the change in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30966 to use the original cache store until we can update to Rack Attack v5.2.3 that has support for `ActiveSupport::Cache::RedisCacheStore` via https://github.com/kickstarter/rack-attack/pull/350. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66449