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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'patch-73' into 'master'	Evan Read	2019-08-27	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Update `only` `chat` statement to correct singular form See merge request gitlab-org/gitlab-ce!32116
\| *	Update `only` `chat` statement to correct singular form	Daniel Gruesso	2019-08-27	1	-1/+1
\|/
*	Merge branch 'qa-ml-dequarantine-tests' into 'master'	Ramya Authappan	2019-08-27	2	-4/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Remove passing tests from quarantine Closes gitlab-org/quality/nightly#127 See merge request gitlab-org/gitlab-ce!32237
\| *	Remove tests from quarantineqa-ml-dequarantine-tests	Mark Lapierre	2019-08-27	2	-4/+2
\| \|
* \|	Merge branch 'docs-fix-omniauth-line' into 'master'	Evan Read	2019-08-27	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add missing blank line to omniauth doc See merge request gitlab-org/gitlab-ce!32250
\| * \|	Add missing blank line to omniauth doc	Marcel Amirault	2019-08-27	1	-0/+1
\|/ /
* \|	Merge branch '63502-encrypt-deploy-token' into 'master'	Stan Hu	2019-08-27	10	-7/+125
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Store deploy tokens encrypted" Closes #63502 See merge request gitlab-org/gitlab-ce!30679
\| * \|	Add limit: 255 to token_ecnrypted column63502-encrypt-deploy-token	Stan Hu	2019-08-26	2	-2/+2
\| \| \|
\| * \|	Removed rubocop disable flags, updated changelog	Etienne Baqué	2019-08-26	2	-4/+2
\| \| \|
\| * \|	Added new index to deploy_tokens table	Etienne Baqué	2019-08-26	2	-0/+18
\| \| \|
\| * \|	Updated call to find deploy token	Etienne Baqué	2019-08-26	2	-3/+3
\| \| \|
\| * \|	Iterating through token to encrypt with find_each	Etienne Baqué	2019-08-26	1	-2/+2
\| \| \|
\| * \|	Added changelog file for this security fix	Etienne Baqué	2019-08-26	2	-0/+5
\| \| \|
\| * \|	Add encrypted optional option to DeployToken authentication field	Etienne Baqué	2019-08-26	2	-1/+1
\| \| \|
\| * \|	Added EncryptDeployTokensTokens spec file	Etienne Baqué	2019-08-26	1	-0/+47
\| \| \|
\| * \|	Added migration to encrypt token in DeployToken records	Etienne Baqué	2019-08-26	4	-1/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added migrations to make token column accepting null values and to add encrypted token column.
* \| \|	Merge branch 'feature-branch-gather-jobs-data' into 'master'	Stan Hu	2019-08-27	14	-451/+474
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce the complexity of our CI configuration Closes #51367 and #65702 See merge request gitlab-org/gitlab-ce!31728
\| * \| \|	Reduce complexity of CI filesfeature-branch-gather-jobs-data	Stan Hu	2019-08-26	14	-451/+474
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'oauth_bypass_two_factor' into 'master'	Michael Kozono	2019-08-27	7	-5/+70
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add option to allow OAuth providers to bypass two factor Closes #56059 See merge request gitlab-org/gitlab-ce!31996
\| * \| \| \|	Update docs and comments about saml with allow_bypass_two_factor	dodocat	2019-08-27	7	-5/+70
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	allow_bypass_two_factor configration dose not work with saml provider
* \| \| \|	Merge branch 'docs-no-more-k8s-service-template' into 'master'	Evan Read	2019-08-27	1	-3/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Remove mention of Kubernetes service templates See merge request gitlab-org/gitlab-ce!32093
\| * \| \| \|	Remove mention of Kubernetes service templatesdocs-no-more-k8s-service-template	Thong Kuah	2019-08-22	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This has since been removed
* \| \| \| \|	Merge branch 'doc_api_events' into 'master'	Evan Read	2019-08-27	1	-6/+6
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update doc/api/events.md See merge request gitlab-org/gitlab-ce!32071
\| * \| \| \|	Update doc/api/events.md	Alexis Sánchez	2019-08-27	1	-6/+6
\|/ / / /
* \| \| \|	Merge branch 'ci-job-rules-docs' into 'master'	Evan Read	2019-08-27	1	-0/+120
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CI Yaml configuration docs for using job rules See merge request gitlab-org/gitlab-ce!32026
\| * \| \| \|	CI Yaml configuration docs for using job rules	drew	2019-08-27	1	-0/+120
\|/ / / /
* \| \| \|	Merge branch 'sh-fix-piwik-template' into 'master'	Ash McKenzie	2019-08-27	3	-2/+27
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Piwik not working Closes #66627 See merge request gitlab-org/gitlab-ce!32234
\| * \| \| \|	Fix Piwik not workingsh-fix-piwik-template	Stan Hu	2019-08-26	3	-2/+27
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to indentation, the changes in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31402 broke the templating of Piwik script header. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66627
* \| \| \|	Merge branch 'sh-guard-against-orphaned-project-feature' into 'master'	Michael Kozono	2019-08-26	3	-0/+20
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Guard against deleted project feature entry Closes #66482 See merge request gitlab-org/gitlab-ce!32187
\| * \| \| \|	Guard against deleted project feature entry	Stan Hu	2019-08-26	3	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In https://gitlab.com/gitlab-org/gitlab-ce/issues/66482, we see that a project's `project_feature` association may be lazily loaded and hence return `nil` if the entry is deleted if the `Project` is already loaded in memory. To ensure we don't fail hard when this happens, assume all features are disabled. We can fix this issue by eager loading the `project_feature` in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32169, but we shouldn't have to depend on that. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66482
* \| \| \| \|	Merge branch 'revert-e2251a09' into 'master'	Mayra Cabrera	2019-08-26	8	-204/+105
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'user-tracking-settings' into 'master'" See merge request gitlab-org/gitlab-ce!32235
\| * \| \| \| \|	Revert "Merge branch 'user-tracking-settings' into 'master'"	Jeremy Jackson	2019-08-26	8	-204/+105
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !31826
* \| \| \| \|	Merge branch 'ab-codeowners-database' into 'master'	Mayra Cabrera	2019-08-26	1	-6/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change database codeowners to database maintainer group See merge request gitlab-org/gitlab-ce!32229
\| * \| \| \| \|	Change database maintainers group for codeowners	Andreas Brandl	2019-08-26	1	-6/+7
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Aligning with backend maintainers, @gitlab-org/maintainers/database is now used for codeowners.
* \| \| \| \|	Merge branch 'setting_mirror_repos_too_big' into 'master'	Tim Zallmann	2019-08-26	2	-5/+0
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	apps: remove the too big "Mirror a repository" header Closes #66445 See merge request gitlab-org/gitlab-ce!32097
\| * \| \| \|	locale: remove unused "Mirror a repository" entry	NeroBurner	2019-08-23	1	-3/+0
\| \| \| \| \|
\| * \| \| \|	apps: remove the too big "Mirror a repository" header	NeroBurner	2019-08-22	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/66445
* \| \| \| \|	Merge branch 'docs/53811-move-multiple-issue-boards-to-free-and-core' into ↵	Achilleas Pipinellis	2019-08-26	3	-22/+14
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Added note that Multiple Issue Boards moved tiers. See merge request gitlab-org/gitlab-ce!31829
\| * \| \| \| \|	Added note that Multiple Issue Boards moved tiers.	Russell Dickenson	2019-08-26	3	-22/+14
\|/ / / / /
* \| \| \| \|	Merge branch 'patch-74' into 'master'	Mike Greiling	2019-08-26	2	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix: remove double % See merge request gitlab-org/gitlab-ce!32178
\| * \| \| \| \|	fix: remove double % from layout width description	Владислав Поляков	2019-08-24	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update show.html.haml
* \| \| \| \| \|	Merge branch 'docs-jv-gitaly-concurrency-limiter' into 'master'	Achilleas Pipinellis	2019-08-26	1	-0/+41
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation about Gitaly concurrency limiter See merge request gitlab-org/gitlab-ce!31902
\| * \| \| \| \| \|	Add documentation about Gitaly concurrency limiter	Jacob Vosmaer	2019-08-26	1	-0/+41
\|/ / / / / /
* \| \| \| \| \|	Merge branch '13764-fix' into 'master'	Mayra Cabrera	2019-08-26	1	-2/+0
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary include Closes gitlab-ee#13764 See merge request gitlab-org/gitlab-ce!32173
\| * \| \| \| \|	Remove unnecessary include	Reuben Pereira	2019-08-26	1	-2/+0
\|/ / / / /
* \| \| \| \|	Merge branch 'mdl-to-markdownlint' into 'master'	Achilleas Pipinellis	2019-08-26	10	-64/+55
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change mdl to markdownlint for docs linting Closes #65806 See merge request gitlab-org/gitlab-ce!31994
\| * \| \| \| \|	Change docs markdown linter	Marcel Amirault	2019-08-26	10	-64/+55
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change from ruby mdl to node markdownlint, add config file to root of project, delete old config file, update exceptions, and fix one doc that was didn't meet standards
* \| \| \| \|	Merge branch 'docs-kramdown-warnings-3' into 'master'	Achilleas Pipinellis	2019-08-26	3	-181/+170
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add backticks and remove brackets causing kramdown warnings See merge request gitlab-org/gitlab-ce!32197
\| * \| \| \| \|	Add backticks and remove square brackets	Marcel Amirault	2019-08-26	3	-181/+170
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Square and Angle bracket use causes kramdown warnings, so changed or enclosed in backticks as needed
* \| \| \| \|	Merge branch 'ee-12032-defaults-to-python-3-docs' into 'master'	Achilleas Pipinellis	2019-08-26	1	-4/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document that License Compliance defaults to Python 3 See merge request gitlab-org/gitlab-ce!31910