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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add `db_spin` and refactor ChaosControllerimprove-chaos-controller	Kamil Trzciński	2019-07-11	3	-46/+113
\|
*	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
\| * \| \| \|	Fixed back navigation for projects filter62088-search-back	Denys Mishunov	2019-07-05	6	-4/+102
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Filterable list now sends request to filter the projects list explicitly with `json` extension to avoid breakage when navigating back from a project to the filtered project's list.
* \| \| \| \|	Merge branch 'docs-update-qa-readme-gdk-port' into 'master'	Mark Lapierre	2019-07-11	1	-4/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update qa/README.md GDK port See merge request gitlab-org/gitlab-ce!30596
\| * \| \| \| \|	Update qa/README.md GDK port	Mark Lapierre	2019-07-11	1	-4/+4
\|/ / / / /
* \| \| \| \|	Merge branch 'sh-bump-rspec-versions' into 'master'	Mayra Cabrera	2019-07-10	6	-26/+29
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade rspec-rails to 3.8.2 and dependencies See merge request gitlab-org/gitlab-ce!28378
\| * \| \| \| \|	Upgrade rspec-rails to 3.8.2 and dependenciessh-bump-rspec-versions	Douglas Barbosa Alexandre	2019-07-10	6	-26/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This brings the rspec-core version in line with the Gitaly changes and introduces Rails 5.1/5.2 improvements. Full CHANGELOG: https://github.com/rspec/rspec-rails/blob/master/Changelog.md
* \| \| \| \| \|	Merge branch 'sl-stablise-basic-login-spec' into 'master'	Dan Davison	2019-07-10	6	-17/+30
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix basic login test stability Closes gitlab-org/quality/staging#57 See merge request gitlab-org/gitlab-ce!30446
\| * \| \| \| \| \|	Revert to using retry_untilsl-stablise-basic-login-spec	Sanad Liaquat	2019-07-09	3	-4/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use retry on exception	Sanad Liaquat	2019-07-09	2	-4/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Retry sign out if unsuccessful	Sanad Liaquat	2019-07-09	4	-14/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also extract retry_until into qa/qa/support/retrier.rb
* \| \| \| \| \| \|	Merge branch 'jivanvl-support-additional-panel-types' into 'master'	Fatih Acet	2019-07-10	17	-75/+280
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support additional panel types Closes #60008 See merge request gitlab-org/gitlab-ce!30001
\| * \| \| \| \| \| \|	Add support for additional panel types	Jose Ivan Vargas	2019-07-10	17	-75/+280
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This introduces the single stat chart component aside from the area chart component
* \| \| \| \| \| \|	Merge branch 'fix_simple_format_undefined' into 'master'	Robert Speicher	2019-07-10	2	-5/+80
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix `simple_format` undefined error #60179 Closes #60179 See merge request gitlab-org/gitlab-ce!30366
\| * \| \| \| \| \| \|	Extract plain file rendering into a separate method	Vasiliy Yakliushin	2019-07-07	1	-3/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix undefined method `simple_format for MarkupHelper:Module	Vasiliy Yakliushin	2019-07-07	2	-2/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`simple_format` is not defined in ActionView::Helpers::TagHelper, but it is actually located in ActionView::Helpers::TextHelper. The solution is to include the correct helper. I've also added tests for `#markup_unsafe` because they were missing.
* \| \| \| \| \| \| \|	Merge branch '54102-add-rubocop-for-rails-logger' into 'master'	Stan Hu	2019-07-10	101	-112/+233
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds a Rubocop cop for Rails.logger Closes #54102 See merge request gitlab-org/gitlab-ce!30415
\| * \| \| \| \| \| \| \|	Add a rubocop for Rails.logger	Mayra Cabrera	2019-07-10	101	-112/+233
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Suggests to use a JSON structured log instead Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/54102
* \| \| \| \| \| \| \|	Merge branch 'docs-code-block-style-3' into 'master'	Achilleas Pipinellis	2019-07-10	15	-429/+434
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix whitespace in many administration docs (part 2) See merge request gitlab-org/gitlab-ce!30555
\| * \| \| \| \| \| \| \|	Fix whitespace in many administration docs	Marcel Amirault	2019-07-10	15	-429/+434
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 for many admin docs (part 2)
* \| \| \| \| \| \| \|	Merge branch 'docs/edit-graphql' into 'master'	Achilleas Pipinellis	2019-07-10	2	-6/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edit GraphQL general availability text See merge request gitlab-org/gitlab-ce!30541
\| * \| \| \| \| \| \| \|	Edit GraphQL general availability text	Evan Read	2019-07-10	2	-6/+7
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'docs-move-pgbouncer-ha-docs-out-of-db-docs' into 'master'	Achilleas Pipinellis	2019-07-10	2	-83/+83
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moving Pgbouncer HA documentation out of database documentation Closes #63540 See merge request gitlab-org/gitlab-ce!30471
\| * \| \| \| \| \| \| \|	Moving Pgbouncer HA documentation out of database documentationdocs-move-pgbouncer-ha-docs-out-of-db-docs	abuerer	2019-07-09	2	-83/+83
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch ↵	Stan Hu	2019-07-10	4	-12/+67
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'backstage/gb/improve-performance-environment-statuses-endpoint' into 'master' Improve performance of fetching environments statuses Closes #62589 See merge request gitlab-org/gitlab-ce!30560
\| * \| \| \| \| \| \| \| \|	Add changelog for ci/cd environments Gitaly N+1 fixbackstage/gb/improve-performance-environment-statuses-endpoint	Grzegorz Bizon	2019-07-10	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Resolve Gitaly N+1 for CI/CD environments statuses	Grzegorz Bizon	2019-07-10	2	-4/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add additional test case for Gitaly N+1 for diff files	Grzegorz Bizon	2019-07-10	2	-37/+70
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add a test for `ci_environments_status` Gitaly N+1	Grzegorz Bizon	2019-07-10	1	-16/+34
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'rf-optional-pipeline-for-vulnerabilities-api' into 'master'	Douwe Maan	2019-07-10	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Vulnerabilities API now supports pipeline_id See merge request gitlab-org/gitlab-ce!30086
\| * \| \| \| \| \| \| \| \| \|	Vulnerabilities API now supports pipeline_id	rossfuhrman	2019-07-10	1	-0/+2
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'winh-notes-service-deleteNote' into 'master'	Clement Ho	2019-07-10	4	-15/+15
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deleteNote from notes service See merge request gitlab-org/gitlab-ce!30537
\| * \| \| \| \| \| \| \| \| \|	Remove deleteNote from notes service	Winnie Hellmann	2019-07-10	4	-15/+15
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'project-dashboards-docs' into 'master'	Achilleas Pipinellis	2019-07-10	1	-1/+64
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs on project-based dashboard config See merge request gitlab-org/gitlab-ce!28154
\| * \| \| \| \| \| \| \| \| \|	Add docs on project-based dashboard config	Sarah Yasonik	2019-07-10	1	-1/+64
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch '62363-follow-up-from-move-more-project-routes-under-scope' ↵	Lin Jen-Shin	2019-07-10	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Add controller spec for deploy tokens Closes #62363 See merge request gitlab-org/gitlab-ce!30311
\| * \| \| \| \| \| \| \| \|	Add routing spec for deploy_tokens controller	Dmitriy Zaporozhets	2019-07-10	1	-0/+6
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch '63044-cluster-health-group-refactor' into 'master'	Douglas Barbosa Alexandre	2019-07-10	16	-208/+235
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor common_metrics importer into a more extensible pattern Closes #63044 See merge request gitlab-org/gitlab-ce!30012
\| * \| \| \| \| \| \| \| \|	Remove unnecessary let in spec63044-cluster-health-group-refactor	Ryan Cobb	2019-07-09	1	-6/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove unnecessary rubocop disable	Ryan Cobb	2019-07-09	1	-2/+0
\| \| \| \| \| \| \| \| \| \|