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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix merge button dropdown (CE)ce-nfriend-fix-the-merge-button	Nathan Friend	2019-08-12	3	-16/+18
\| \| \| \| \| \| \|	This commit fixes an issue that was causing the merge button dropdown trigger to be shown even if the dropdown itself was hidden. This commit also fixes an issue that caused the "Merge Immediately" option not to be available when merge trains were enabled.
*	Merge branch '65278-fix-puma-master-counter-wipe' into 'master'	Stan Hu	2019-08-12	5	-25/+25
\|\ \| \| \| \| \| \| \| \|	Fix active metric files being wiped after the app starts See merge request gitlab-org/gitlab-ce!31668
\| *	Remove worker label from puma terminations metric65278-fix-puma-master-counter-wipe	Aleksei Lipniagov	2019-08-12	2	-6/+2
\| \|
\| *	Clean prometheus dir only for master process	Aleksei Lipniagov	2019-08-12	1	-1/+5
\| \|
\| *	Remove extra blank line	Aleksei Lipniagov	2019-08-12	1	-1/+0
\| \|
\| *	Fix metric files being wiped after the app starts	Aleksei Lipniagov	2019-08-12	3	-19/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we hit our app with the initial request, in `warmup`, some metrics already being created as well as corresponding files. If we do `multiproc_file_dir` cleanup after that, we delete the files from the dir while keeping them in memory which leads to the incorrect behavior: the metric is being updated in in-memory, while is not present in the db, not sent to Prometheus as the result.
* \|	Merge branch 'renovate/gitlab-ui-5.x' into 'master'	Clement Ho	2019-08-12	2	-5/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update dependency @gitlab/ui to v5.15.0 See merge request gitlab-org/gitlab-ce!31551
\| * \|	Update dependency @gitlab/ui to v5.15.0	Lukas Eipert	2019-08-08	2	-5/+5
\| \| \|
* \| \|	Merge branch 'jv-gitaly-1.58.0' into 'master'	Stan Hu	2019-08-12	5	-44/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Gitaly server and gem to 1.58.0 See merge request gitlab-org/gitlab-ce!31588
\| * \| \|	Update Gitaly server and gem to 1.58.0	Jacob Vosmaer	2019-08-12	5	-44/+5
\|/ / /
* \| \|	Merge branch 'georgekoltsov/63408-user-mapping' into 'master'	Grzegorz Bizon	2019-08-12	10	-21/+55
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add author lines to project import comments See merge request gitlab-org/gitlab-ce!31579
\| * \| \|	Add code review suggestions	George Koltsov	2019-08-12	1	-4/+4
\| \| \| \|
\| * \| \|	Apply code review feedback	George Koltsov	2019-08-08	4	-16/+13
\| \| \| \|
\| * \| \|	Update project/import/bitbucket.md doc	George Koltsov	2019-08-07	1	-5/+5
\| \| \| \|
\| * \| \|	Add bitbucket_import/importer_spec.rb spec	George Koltsov	2019-08-07	4	-11/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Replace `username` field with `nickname` due to updates in BitBucket Cloud API - Add new imported spec validating addition of `authod_line`
\| * \| \|	Add changelog entry	George Koltsov	2019-08-07	1	-0/+6
\| \| \| \|
\| * \| \|	Add author lines to project import comments	George Koltsov	2019-08-07	4	-5/+13
\| \| \| \|
* \| \| \|	Merge branch 'sh-update-ruby-labkit' into 'master'	Robert Speicher	2019-08-12	2	-4/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab-labkit to 0.4.2 See merge request gitlab-org/gitlab-ce!31685
\| * \| \| \|	Update gitlab-labkit to 0.4.2sh-update-ruby-labkit	Stan Hu	2019-08-10	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This relaxes the gRPC version so that it can be updated. Also adds cache support for distributed tracing. Full release notes: https://gitlab.com/gitlab-org/labkit-ruby/-/tags
* \| \| \| \|	Merge branch 'georgekoltsov/51260-add-filtering-to-bitbucket-server-import' ↵	Tim Zallmann	2019-08-12	10	-8/+53
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Add BitBucketServerImport project filtering See merge request gitlab-org/gitlab-ce!31420
\| * \| \| \| \|	Add filter param sanitizationgeorgekoltsov/51260-add-filtering-to-bitbucket-server-import	George Koltsov	2019-08-12	3	-4/+10
\| \| \| \| \| \|
\| * \| \| \| \|	Update import/bitbucket_server.md docs	George Koltsov	2019-08-12	3	-2/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Add BitbucketServerController filtering spec	George Koltsov	2019-08-12	2	-2/+14
\| \| \| \| \| \|
\| * \| \| \| \|	Add bitbucket_server/client_spec.rb spec	George Koltsov	2019-08-12	1	-0/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Add i18n strings	George Koltsov	2019-08-12	1	-0/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Add changelog entry	George Koltsov	2019-08-12	4	-8/+14
\| \| \| \| \| \|
\| * \| \| \| \|	Add BitBucketServerImport project filtering	George Koltsov	2019-08-12	3	-2/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'alipniagov-fix-wiki_can_not_be_created_total-counter' into ↵	Thong Kuah	2019-08-12	3	-2/+10
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix :wiki_can_not_be_created_total counter See merge request gitlab-org/gitlab-ce!31673
\| * \| \| \| \|	Fix :wiki_can_not_be_created_total counteralipniagov-fix-wiki_can_not_be_created_total-counter	Aleksei Lipniagov	2019-08-09	3	-2/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs-correct-new-branch-text-instead-of-lorem-ipsum' into 'master'	Achilleas Pipinellis	2019-08-12	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace Lorem Ipsum with actual screenshot text in docs See merge request gitlab-org/gitlab-ce!31412
\| * \| \| \| \| \|	Replace Lorem Ipsum with actual screenshot textdocs-correct-new-branch-text-instead-of-lorem-ipsum	Rene Verschoor	2019-08-02	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '61332-web-ide-mr-branch-dropdown-closes-unexpectedly' into ↵	Kushal Pandya	2019-08-12	4	-31/+31
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Web IDE MR/branch dropdown closes unexpectedly" Closes #61332 See merge request gitlab-org/gitlab-ce!31523
\| * \| \| \| \| \| \|	Reduce the default height of MR/branch dropdowns61332-web-ide-mr-branch-dropdown-closes-unexpectedly	Himanshu Kapoor	2019-08-09	3	-7/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To avoid having empty areas in the dropdown that occupy unnessary space, I removed the dropdown's min-height and changed its default height in empty state to be same as its loading state (with the spinner).
\| * \| \| \| \| \| \|	Focus on the input when clicked outside the input	Himanshu Kapoor	2019-08-09	4	-28/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed in MR list and branch list components. Earlier clicking right outside the input box closed the dropdown, which was unexpected behaviour. To make it consistent with the behaviour of select2 jquery plugin, I have made clicking outside the input focus on the input by using a label.
* \| \| \| \| \| \| \|	Merge branch 'docs-civariables-mr' into 'master'	Achilleas Pipinellis	2019-08-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: CI predefined variables: push request -> MR See merge request gitlab-org/gitlab-ce!31711
\| * \| \| \| \| \| \| \|	CI predefined variables: push request -> MR	Stefan Schmalzhaf	2019-08-12	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'jenkins-update-docs' into 'master'	Achilleas Pipinellis	2019-08-12	1	-0/+28
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Groovy vs. YAML section to CI Jenkins doc See merge request gitlab-org/gitlab-ce!31601
\| * \| \| \| \| \| \| \|	Merge deploy keys example to deploy keys API docs	Jason Lenny	2019-08-12	1	-0/+28
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No reason to keep them separate.
* \| \| \| \| \| \| \|	Merge branch 'docs-image-alignment-2' into 'master'	Achilleas Pipinellis	2019-08-12	16	-125/+119
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix markdown spacing in various docs (part 4) See merge request gitlab-org/gitlab-ce!31710
\| * \| \| \| \| \| \| \|	Fix markdown spacing in various docs	Marcel Amirault	2019-08-12	16	-125/+119
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Align images and lists in assorted markdown docs
* \| \| \| \| \| \| \|	Merge branch 'docs-image-alignment' into 'master'	Achilleas Pipinellis	2019-08-12	14	-103/+108
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix markdown spacing in various docs (part 3) See merge request gitlab-org/gitlab-ce!31709
\| * \| \| \| \| \| \| \|	Fix markdown spacing in various docs	Marcel Amirault	2019-08-12	14	-103/+108
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Align images and lists in assorted markdown docs
* \| \| \| \| \| \| \|	Merge branch 'docs/consistent-section-headings' into 'master'	Achilleas Pipinellis	2019-08-12	6	-7/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make section headings consistent See merge request gitlab-org/gitlab-ce!31703
\| * \| \| \| \| \| \| \|	Make section headings consistent	Evan Read	2019-08-12	6	-7/+7
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch ↵docs-4453-external-exporters	Filipa Lacerda	2019-08-12	3	-48/+73
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'44036-someone-edited-the-issue-at-the-same-time-is-regularly-seen-despite-that-being-a-filthy-lie' into 'master' Fix incorrectly displayed conflict warning See merge request gitlab-org/gitlab-ce!31469
\| * \| \| \| \| \| \| \|	Fix conflict warning being incorrectly displayed44036-someone-edited-the-issue-at-the-same-time-is-regularly-seen-despite-that-being-a-filthy-lie	Heinrich Lee Yu	2019-08-12	3	-48/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide warning when update request is in progress
* \| \| \| \| \| \| \| \|	Merge branch 'sh-break-out-invited-group-members' into 'master'	Ash McKenzie	2019-08-12	15	-54/+163
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make it easier to find invited group members Closes #61948 See merge request gitlab-org/gitlab-ce!28436
\| * \| \| \| \| \| \| \| \|	Improve spec description in member_spec.rbsh-break-out-invited-group-members	Stan Hu	2019-08-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Use snake case for tag placeholders	Martin Wortschack	2019-08-09	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Update PO file
\| * \| \| \| \| \| \| \| \|	Fixing missing html_safe calls for pending list	Stan Hu	2019-08-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \|