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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix bullet listdocs/refactor-intro-text-gitlab-apps	Evan Read	2019-09-09	1	-6/+4
\|
*	Align introduced text to standard	Evan Read	2019-09-09	1	-17/+15
\|
*	Merge branch 'docs-group-level-jupyterhub' into 'master'	Evan Read	2019-09-09	1	-3/+5
\|\ \| \| \| \| \| \| \| \|	Document JupyterHub is available for group-level clusters See merge request gitlab-org/gitlab-ce!32718
\| *	Document JupyterHub is available for group-level clustersdocs-group-level-jupyterhub	James Fargher	2019-09-06	1	-3/+5
\| \|
* \|	Merge branch 'docs/standardise_punctuation' into 'master'	Evan Read	2019-09-09	1	-4/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Standardised punctuation at end of sentences See merge request gitlab-org/gitlab-ce!32723
\| * \|	Standardised punctuation at end of sentences	Russell Dickenson	2019-09-09	1	-4/+4
\|/ /
* \|	Merge branch 'docs-api-divergence' into 'master'	Evan Read	2019-09-09	2	-3/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Bring typo fix over from EE See merge request gitlab-org/gitlab-ce!32802
\| * \|	Bring typo fix over from EE	Marcel Amirault	2019-09-09	2	-3/+3
\|/ /
* \|	Merge branch 'docs/remove-unwanted-spaces-plantuml' into 'master'	Evan Read	2019-09-09	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix issue causing linting test failures See merge request gitlab-org/gitlab-ce!32801
\| * \|	Fix issue causing linting test failures	Russell Dickenson	2019-09-09	1	-2/+2
\|/ /
* \|	Merge branch 'docs-add-auto-sign-in-omniauth-blunceford' into 'master'	Evan Read	2019-09-08	1	-0/+30
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add auto_sign_in_with_provider info to OmniAuth doc See merge request gitlab-org/gitlab-ce!32416
\| * \|	Add auto_sign_in_with_provider info to OmniAuth doc	Blair Lunceford	2019-09-08	1	-0/+30
\|/ /
* \|	Merge branch 'patch-71' into 'master'	Evan Read	2019-09-08	1	-1/+16
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	fix for #60120 See merge request gitlab-org/gitlab-ce!30199
\| * \|	fix for #60120	Daniel Le Berre	2019-09-08	1	-1/+16
\|/ /
* \|	Merge branch 'docs-qa-readme-ref' into 'master'	Dan Davison	2019-09-08	1	-3/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Replace GDK ref See merge request gitlab-org/gitlab-ce!32621
\| * \|	Replace GDK ref	Dan Davison	2019-09-08	1	-3/+1
\|/ /
* \|	Merge branch 'bump-fog-google' into 'master'	Stan Hu	2019-09-08	2	-3/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump fog-google to support ADC auth on GCP Closes gitlab-ee#14810 See merge request gitlab-org/gitlab-ce!32775
\| * \|	Bump fog-google to support ADC auth on GCP	Maxim Ivanov	2019-09-06	2	-3/+3
\| \| \|
* \| \|	Merge branch 'remove-unnecessary-freeze-in-app-helpers' into 'master'	Stan Hu	2019-09-08	1	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid calling freeze on already frozen strings in app/helpers See merge request gitlab-org/gitlab-ce!32789
\| * \| \|	Avoid calling freeze on already frozen strings in app/helpers	dineshpanda	2019-09-04	1	-3/+3
\| \| \| \|
* \| \| \|	Merge branch 'kamil-refactor-import-structure' into 'master'	Stan Hu	2019-09-08	14	-587/+580
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Normalize import_export structure See merge request gitlab-org/gitlab-ce!32704
\| * \| \| \|	Normalize import_export structurekamil-refactor-import-structure	Kamil Trzciński	2019-09-06	14	-587/+580
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This brings a significant refactor to how we handle `import_export.yml`, merge it with EE and how we handle that for reader and saver. This is meant to simplify the code, and remove a ton of conditions to handle different models of the structure. This is also meant to prepare the structure to extend it much easier, like adding `preload:` or additional object types when needed. This does not change the behavior of import/export, rather unifies and simplifies the current implementation.
* \| \| \| \|	Merge branch 'patch-73' into 'master'	Marcia Ramos	2019-09-07	1	-3/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated description in the Gitlab Prometheus metrics section See merge request gitlab-org/gitlab-ce!32280
\| * \| \| \| \|	Updated description in the Gitlab Prometheus metrics section	Etienne Baqué	2019-09-07	1	-3/+3
\|/ / / / /
* \| \| \| \|	Merge branch '63044-add-prom-proxies-ce' into 'master'	Kamil Trzciński	2019-09-07	2	-0/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add method to authorize reading from prometheus proxy Closes #63044 See merge request gitlab-org/gitlab-ce!32305
\| * \| \| \| \|	Add method to authorize reading from prometheus proxy	Ryan Cobb	2019-09-07	2	-0/+5
\|/ / / / /
* \| \| \| \|	Merge branch 'ecdsa_pages_certificates' into 'master'	Michael Kozono	2019-09-07	7	-4/+198
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to load ECDSA certificates for pages domains See merge request gitlab-org/gitlab-ce!32393
\| * \| \| \| \|	Allow to load ECDSA certificates for pages domains	Vladimir Shushlin	2019-09-07	7	-4/+198
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Just replace RSA.new with PKey.read
* \| \| \| \|	Merge branch 'weimeng-fix-burndown-x-offset' into 'master'	Mike Greiling	2019-09-06	2	-0/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Backport: Fix x-axis burndown chart offset by timezone See merge request gitlab-org/gitlab-ce!32754
\| * \| \| \| \|	Add timezone-mock packageweimeng-fix-burndown-x-offset	Wei-Meng Lee	2019-09-06	2	-0/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'keyboard-shortcuts-2' into 'master'	Paul Slaughter	2019-09-06	10	-353/+348
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve Keyboard shortcut help screen Closes #65367 See merge request gitlab-org/gitlab-ce!31642
\| * \| \| \| \| \|	Update keyboard shortcuts modal and doc	Marcel Amirault	2019-09-06	10	-353/+348
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing shortcuts, remove shortcuts that don't exist, and reorder as needed
* \| \| \| \| \|	Merge branch 'sh-fix-captcha-state-pollution-spec' into 'master'	Mayra Cabrera	2019-09-06	1	-7/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix order-dependent spec failures with reCAPTCHA Closes #67133 See merge request gitlab-org/gitlab-ce!32771
\| * \| \| \| \|	Fix order-dependent spec failures with reCAPTCHAsh-fix-captcha-state-pollution-spec	Stan Hu	2019-09-06	1	-7/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	spec/controllers/registrations_controller_spec.rb polluted the test environment by changing the Recaptcha configuration. We now stub the controller's `verify_recaptcha` method instead of doing that. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/67133
* \| \| \| \| \|	Merge branch 'update-rouge' into 'master'	Stan Hu	2019-09-06	3	-3/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update rouge to v3.10.0 See merge request gitlab-org/gitlab-ce!32745
\| * \| \| \| \| \|	Update rouge to v3.10.0	Camil Staps	2019-09-06	3	-3/+8
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'docs-update-mr-documentation-template' into 'master'	Achilleas Pipinellis	2019-09-06	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note about permissions in Doc MR template See merge request gitlab-org/gitlab-ce!32755
\| * \| \| \| \| \|	Add note about permissions in Doc MR template	Tetiana Chupryna	2019-09-06	1	-0/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs-typo' into 'master'	Achilleas Pipinellis	2019-09-06	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Fix typo in "Description templates" See merge request gitlab-org/gitlab-ce!32757
\| * \| \| \| \| \|	Fix typo	Stefan Schmalzhaf	2019-09-06	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'qa/e2e-tests-for-multiple-boards-on-group-level' into 'master'	Walmyr Lima e Silva Filho	2019-09-06	2	-3/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update view for testability See merge request gitlab-org/gitlab-ce!32644
\| * \| \| \| \| \| \|	Update views for testabilityqa/e2e-tests-for-multiple-boards-on-group-level	Walmyr Lima	2019-09-05	2	-3/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'marketo_lead_trials' into 'master'	Robert Speicher	2019-09-06	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Back porting changes to trigger user create event on Trial sign up See merge request gitlab-org/gitlab-ce!32676
\| * \| \| \| \| \| \| \|	Back porting changes to trigger user create event on Trial sign up	Aishwarya Subramanian	2019-09-06	1	-0/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'only-show-copy_metadata-when-usable' into 'master'	Douglas Barbosa Alexandre	2019-09-06	3	-1/+19
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only show `/copy_metadata` when usable See merge request gitlab-org/gitlab-ce!31735
\| * \| \| \| \| \| \| \|	Only show `/copy_metadata` when usable	Lee Tickett	2019-09-06	3	-1/+19
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'ac-accelerate-wiki-attachments' into 'master'	Nick Thomas	2019-09-06	7	-10/+137
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	accelerate wiki attachments See merge request gitlab-org/gitlab-ce!32663
\| * \| \| \| \| \| \| \|	Test blob_controller POST createac-accelerate-wiki-attachments	Alessio Caiazza	2019-09-06	1	-0/+38
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Process workhorse accelerated wiki uploads	Alessio Caiazza	2019-09-06	6	-10/+99
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wiki attachments can be workhorse accelerated. This commit is backward compatible with older workhorse
* \| \| \| \| \| \| \|	Merge branch 'id-autosave-for-new-mr' into 'master'	Stan Hu	2019-09-06	5	-6/+21
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix sharing notes data in localStorage with all MRs See merge request gitlab-org/gitlab-ce!32699