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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove spec feature stubbing10685-remove-feature-flag-ce	Mark Chao	2019-06-04	3	-4/+0
\|
*	Update doc on approval	Mark Chao	2019-06-04	1	-1/+1
\|
*	FE: Remove legacy approval feature in MR files	Paul Slaughter	2019-06-04	1	-2/+0
\|
*	Merge branch ↵	Kamil Trzciński	2019-06-04	11	-150/+234
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'set-real-next-run-at-for-preventing-duplciate-pipeline-creations' into 'master' Make pipeline schedule worker resilient Closes gitlab-com/gl-infra/production#805 and #61955 See merge request gitlab-org/gitlab-ce!28407
\| *	Make pipeline schedule worker resilientset-real-next-run-at-for-preventing-duplciate-pipeline-creations	Shinya Maeda	2019-06-03	11	-150/+234
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, pipeline schedule worker is unstable because it's sometimes killed by excessive memory consumption. In order to improve the performance, we add the following fixes: 1. next_run_at is always real_next_run, which means the value always takes into account of worker's cron schedule 1. Remove exlusive lock. This is already covered by real_next_run change. 1. Use RunPipelineScheduleWorker for avoiding memory killer. Memory consumption is spread to the multiple sidekiq worker.
* \|	Merge branch 'ce-fe-fix-ee-diff-profile-key-views' into 'master'	Bob Van Landuyt	2019-06-04	3	-4/+11
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve EE/CE differences in app/views/profiles/keys See merge request gitlab-org/gitlab-ce!28900
\| * \|	Resolved EE differences in app/views/profiles/keysce-fe-fix-ee-diff-profile-key-views	Paul Slaughter	2019-05-31	3	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	How? It creates a base method `can_delete?` on Key which will always be true in CE and is overridden in EE. Added changelog entry
* \| \|	Merge branch 'adriel-expand-collapse-operation-settings' into 'master'	Kushal Pandya	2019-06-04	4	-3/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add expand/collapse button to operation settings Closes #61511 See merge request gitlab-org/gitlab-ce!28840
\| * \| \|	Add expand/collapse button	Adriel Santiago	2019-06-04	4	-3/+12
\|/ / / \| \| \| \| \| \| \| \| \|	Add ability to expand/collapse operation settings
* \| \|	Merge branch 'docs/ssot_admin_area_third_party_offers' into 'master'	Evan Read	2019-06-04	1	-3/+20
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edited `Third Party Offers` for SSOT guidelines See merge request gitlab-org/gitlab-ce!29103
\| * \| \|	Edited `Third Party Offers` for SSOT guidelines	Russell Dickenson	2019-06-04	1	-3/+20
\|/ / /
* \| \|	Merge branch '61640-set-font-size-on-html-not-body' into 'master'	Mike Greiling	2019-06-04	2	-2/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use rems instead of px to set body font-size Closes #61640 See merge request gitlab-org/gitlab-ce!28544
\| * \| \|	Use rems for body font-size to help accessibility61640-set-font-size-on-html-not-body	Sam Bigelow	2019-06-03	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Use rems instead of px to set default font-size This allows users to change font sizes in their browser and it will affect the view in our application
* \| \| \|	Merge branch 'docs-aws-elb-web-terminals' into 'master'	Mike Lewis	2019-06-04	1	-0/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation about AWS ELB not supporting web sockets See merge request gitlab-org/gitlab-ce!28030
\| * \| \| \|	Add AWS ELB note about not supporting web socketsdocs-aws-elb-web-terminals	Drew Blessing	2019-05-02	1	-0/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs-update-ci-quickstart-readme' into 'master'	Evan Read	2019-06-04	1	-1/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add CI quickstart updates See merge request gitlab-org/gitlab-ce!24702
\| * \| \| \| \|	Add CI quickstart updates	Cindy Pallares 🦉	2019-06-04	1	-1/+9
\|/ / / / /
* \| \| \| \|	Merge branch 'docs/admin_area_gitaly_servers' into 'master'	Evan Read	2019-06-04	1	-1/+18
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document the Admin Area's Gitaly Servers page See merge request gitlab-org/gitlab-ce!28987
\| * \| \| \| \|	Document the Admin Area's Gitaly Servers page	Russell Dickenson	2019-06-04	1	-1/+18
\|/ / / / /
* \| \| \| \|	Merge branch 'sh-fix-version-12-0' into 'master'	Robert Speicher	2019-06-04	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	VERSION file should be 12.0, not 11.12 See merge request gitlab-org/gitlab-ce!29092
\| * \| \| \| \|	VERSION file should be 12.0, not 11.12	Stan Hu	2019-06-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was apparently causing Gitlab.version_info to return the wrong values, causing the wrong images to be loaded via CI_SERVER_VERSION.
* \| \| \| \| \|	Merge branch 'docs/ssot_sign_up_restrictions' into 'master'	Evan Read	2019-06-04	1	-0/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edited signup restrictions for SSOT guidelines See merge request gitlab-org/gitlab-ce!29049
\| * \| \| \| \| \|	Edited signup restrictions for SSOT guidelines	Russell Dickenson	2019-06-04	1	-0/+16
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs/fix-doc-block' into 'master'	Evan Read	2019-06-03	1	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix markdown parsing for doc page See merge request gitlab-org/gitlab-ce!29056
\| * \| \| \| \| \|	Fix markdown parsing for doc pagedocs/fix-doc-block	Steve Azzopardi	2019-06-03	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The lack of indentatioin is causing the markdown parser to get confused and formating it wrong.
* \| \| \| \| \| \|	Merge branch 'nik-api-snippets-fix' into 'master'	Evan Read	2019-06-03	1	-5/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Snippets API doc fixes: content->code; visibility is required See merge request gitlab-org/gitlab-ce!28571
\| * \| \| \| \| \| \|	Update description of Snippets API, create and update methods	Nikolay Samokhvalov	2019-06-03	1	-5/+5
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, the field used to fill the contents is called "code". Also "visibility" is now required.
* \| \| \| \| \| \|	Merge branch 'sh-fix-import-url-update' into 'master'	Thong Kuah	2019-06-03	3	-0/+19
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project settings not being able to update Closes #62708 See merge request gitlab-org/gitlab-ce!29097
\| * \| \| \| \| \| \|	Fix project settings not being able to update	Stan Hu	2019-06-03	3	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously import_url would always be present in the update parameters, which would cause the validation to fail. We now only include this parameter only if there is URL given. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62708
* \| \| \| \| \| \| \|	Merge branch 'docs/instance_template_repository_ssot' into 'master'	Evan Read	2019-06-03	1	-0/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edit Instance template repository for SSOT epic See merge request gitlab-org/gitlab-ce!29032
\| * \| \| \| \| \| \| \|	Edit Instance template repository for SSOT epic	Russell Dickenson	2019-06-03	1	-0/+16
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'docs-herokuish-instead-of-bin-setup' into 'master'	Evan Read	2019-06-03	1	-7/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use /bin/herokuish in Auto DevOps docs examples See merge request gitlab-org/gitlab-ce!28974
\| * \| \| \| \| \| \| \|	Use /bin/herokuish in Auto DevOps docs examplesdocs-herokuish-instead-of-bin-setup	Dylan Griffith	2019-06-03	1	-7/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The previous examples did work however they had a problem when the bin/setup script installed a different bundler version than the one in your Gemfile.lock. It is safer to use `/bin/herokuish procfile exec` to get access to all the environment already installed for your application instead of installing bundler again.
* \| \| \| \| \| \| \| \|	Merge branch 'ce-nfriend-no-implicit-coercion-fixes' into 'master'	Mike Greiling	2019-06-03	50	-71/+76
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Backport of !13803: "Fix all `no-implicit-coercion` ESLint violations See merge request gitlab-org/gitlab-ce!29007
\| * \| \| \| \| \| \| \| \|	Comply with `no-implicit-coercion` rule (CE)	Nathan Friend	2019-06-03	50	-71/+76
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit is the result of running `yarn eslint --fix` after enabling the `no-implicit-coercion` ESLint rule. This rule has been added to our ESLint config here: https://gitlab.com/gitlab-org/gitlab-eslint-config/merge_requests/14
* \| \| \| \| \| \| \| \|	Merge branch '61264-dast-report-error' into 'master'	Mayra Cabrera	2019-06-03	1	-36/+38
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backporting EE fix Closes #61264 See merge request gitlab-org/gitlab-ce!29004
\| * \| \| \| \| \| \| \|	Backporting EE fix	rossfuhrman	2019-06-03	1	-36/+38
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'winh-boardsStore.moving' into 'master'	Mike Greiling	2019-06-03	3	-2/+21
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move boardsStore.moving to BoardList component See merge request gitlab-org/gitlab-ce!29076
\| * \| \| \| \| \| \| \|	Move boardsStore.moving to BoardList component	Winnie Hellmann	2019-06-03	3	-2/+21
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'selfmanaged-gitlabcom-import-update-docs' into 'master'	Drew Blessing	2019-06-03	1	-2/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify "support" to mean GitLab.com integration See merge request gitlab-org/gitlab-ce!29091
\| * \| \| \| \| \| \| \|	Clarify "support" to mean GitLab.com integration	Greg Myers	2019-06-03	1	-2/+3
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'qa-log-out-in-after-all-hook' into 'master'	Dan Davison	2019-06-03	1	-0/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Log out in after all hook See merge request gitlab-org/gitlab-ce!28969
\| * \| \| \| \| \| \| \|	Log out in after all hookqa-log-out-in-after-all-hook	Mark Lapierre	2019-05-31	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So subsequent tests can successfully log in
* \| \| \| \| \| \| \| \|	Merge branch 'tc-db-explain-analyze' into 'master'	Kamil Trzciński	2019-06-03	3	-0/+34
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add activerecord-explain-analyze gem See merge request gitlab-org/gitlab-ce!29051
\| * \| \| \| \| \| \| \|	Add activerecord-explain-analyze gem	Toon Claes	2019-06-03	3	-0/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This gem allows you to get the `EXPLAIN ANALYZE` query plan, directly from the Rails console. The gem is installed with `require: false`, but if it was loaded on launch, this would be it's memory load: ``` TOP: 145.3086 MiB rails/all: 22.4844 MiB ... activerecord-explain-analyze: 2.9648 MiB active_record/connection_adapters/postgresql_adapter: 2.9648 MiB pg: 2.9648 MiB pg_ext: 2.9648 MiB ... ```
* \| \| \| \| \| \| \| \|	Merge branch 'qa-tentative-to-de-quarantine-e2e-test' into 'master'	Dan Davison	2019-06-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport EE MR See merge request gitlab-org/gitlab-ce!29066
\| * \| \| \| \| \| \| \|	Backport EE MRqa-tentative-to-de-quarantine-e2e-test	Walmyr Lima	2019-06-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13913
* \| \| \| \| \| \| \| \|	Merge branch 'lm-update-mermaid-arch' into 'master'	Achilleas Pipinellis	2019-06-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update architecture.md to fix typo in GitLabMonito -> GitLabMonitor See merge request gitlab-org/gitlab-ce!28955
\| * \| \| \| \| \| \| \|	Update architecture.md to fix typo in GitLabMonito -> GitLabMonitor	Lee Matos	2019-06-03	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'sh-resolve-member-presenter-conflicts' into 'master'	Robert Speicher	2019-06-03	2	-1/+17
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reconcile CE and EE differences in members/_member.html.haml See merge request gitlab-org/gitlab-ce!29021