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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use stricter regex anchorsroute-map-string-source	Douwe Maan	2017-02-07	1	-1/+1
\|
*	Support a string source in the route map	Douwe Maan	2017-02-07	1	-17/+15
\|
*	Merge branch 'route-map' into 'master'	Robert Speicher	2017-02-07	2	-0/+66
\|\ \| \| \| \| \| \| \| \|	Add 'View on [env]' link to blobs and individual files in diffs See merge request !8867
\| *	Address feedback	Douwe Maan	2017-02-06	1	-2/+0
\| \|
\| *	Improve performance of finding last deployed environment	Douwe Maan	2017-02-06	1	-0/+14
\| \|
\| *	Add tests	Douwe Maan	2017-02-06	1	-0/+2
\| \|
\| *	Validate route map	Douwe Maan	2017-02-06	1	-0/+52
\| \|
* \|	Merge branch 'jej-fix-backup-rake-color' into 'master'	Sean McGivern	2017-02-07	1	-6/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fixed backup.rake colorize method following Pages -> CE See merge request !9031
\| * \|	Fixed backup.rake colorize method following Pages -> CEjej-fix-backup-rake-color	Connor Shea	2017-02-07	1	-6/+6
\| \| \| \| \| \| \| \| \|	Cherry-picked 'Remove colorize methods that weren't in CE.'
* \| \|	Merge branch '21518_recaptcha_spam_issues' into 'master'	Sean McGivern	2017-02-07	1	-0/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use reCaptcha when an issue identified as spam Closes #21518 See merge request !8846
\| * \| \|	Use reCaptcha when an issue identified as spam	Jarka Kadlecova	2017-02-07	1	-0/+4
\| \| \| \|
* \| \| \|	Merge branch 'remove-deploy-key-endpoint' into 'master'	Rémy Coutable	2017-02-07	3	-89/+206
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deploy key endpoint Closes #20569 See merge request !8716
\| * \| \| \|	Remove /projects/:id/keys/.. endpoints	Robert Schilling	2017-02-07	3	-89/+206
\| \| \| \| \|
* \| \| \| \|	Merge branch '27785-fix-init-script-after-pages-to-ce' into 'master'	Douwe Maan	2017-02-07	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix syntax error in init.d/gitlab after Pages -> CE Closes #27785 See merge request !9026
\| * \| \| \|	Fix syntax error in init.d/gitlab after Pages -> CE	Drew Blessing	2017-02-07	1	-1/+1
\| \| \|/ / \| \|/\| \| \| \| \| \|	Cherry-picked ‘Fix syntax error in conditional statement’
* \| \| \|	Merge branch 'api-remove-snippets-expires-at' into 'master'	Sean McGivern	2017-02-07	7	-74/+223
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated 'expires_at' from project snippets API Closes #14156 See merge request !8723
\| * \| \|	Split V3 entities into a separate fileapi-remove-snippets-expires-at	Robert Schilling	2017-02-07	6	-93/+95
\| \| \| \|
\| * \| \|	Remove deprecated 'expires_at' from project snippets API	Robert Schilling	2017-02-07	3	-3/+150
\| \| \| \|
* \| \| \|	Merge branch 'fix/import-group-members' into 'master'	Rémy Coutable	2017-02-07	4	-3/+34
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix missing group members from Import/Export Closes #25124 See merge request !8923
\| * \| \| \|	Add missing group members to export for I/Efix/import-group-members	James Lopez	2017-02-07	4	-3/+34
\| \| \| \| \|
* \| \| \| \|	added missed commit in rebase	James Lopez	2017-02-07	1	-3/+1
\| \| \| \| \|
* \| \| \| \|	update Grape routes to work with current version of Grape	James Lopez	2017-02-07	1	-1/+7
\| \| \| \| \|
* \| \| \| \|	Merge branch 'ee-1439-read-only-user' into 'master'	Douwe Maan	2017-02-07	1	-1/+13
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport changes from gitlab-org/gitlab-ee!998 See merge request !8984
\| * \| \| \|	List all groups/projects for admins on explore pages	Douwe Maan	2017-02-06	1	-1/+13
\| \|/ / /
* \| \| \|	Merge branch 'fix-references-header-parsing' into 'master'	Sean McGivern	2017-02-06	2	-6/+27
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix References header parser for Microsoft Exchange Closes #26567 See merge request !8620
\| * \| \| \|	No strong reasons to freeze them	Lin Jen-Shin	2017-02-07	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8620#note_22868713
\| * \| \| \|	Freeze regexp and add a commentfix-references-header-parsing	Lin Jen-Shin	2017-02-03	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8620#note_21590440
\| * \| \| \|	Use references variable	Lin Jen-Shin	2017-02-03	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8620#note_22020035
\| * \| \| \|	Use message_id_regexp variable for the regexp	Lin Jen-Shin	2017-02-03	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8620#note_22021001
\| * \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-02-03	103	-473/+1174
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix-references-header-parsing * upstream/master: (574 commits) remove dateFormat global exception fix relative paths to xterm.js within fit.js use setFixtures instead of fixture.set prevent u2f tests from triggering a form submission while testing simplify test for focus state preload projects.json fixture preload projects.json fixture rework tests which rely on teaspoon-specific behavior Only render hr when user can't archive project. use setFixtures instead of fixture.set ensure helper classes and constants are exposed globally preload projects.json fixture fix fixture references in environments_spec allow console.xxx in tests, reorder eslint rules alphabetically remove redundant "data-toggle" attribute so Vue doesn't complain fix broken reference to formatDate in a CommonJS environment fix errors within gl_dropdown_spec.js when running in Karma fix intermittant errors in merge_commit_message_toggle_spec.rb Update installation docs to include Docker, others ignore node_modules in rubocop ...
\| * \| \| \| \|	Specify that iOS app would also do this	Lin Jen-Shin	2017-01-20	1	-1/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Fix References header parser for Microsoft Exchange	Lin Jen-Shin	2017-01-20	2	-6/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Microsoft Exchange would append a comma and another message id into the References header, therefore we'll need to fallback and parse the header by ourselves. Closes #26567
* \| \| \| \| \|	Merge branch 'fix/gb/backwards-compatibility-coverage-ci-yml' into 'master'	Douwe Maan	2017-02-06	1	-4/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove coverage entry from global CI/CD options See merge request !8981
\| * \| \| \| \| \|	Remove coverage entry from global CI/CD options	Grzegorz Bizon	2017-02-04	1	-4/+1
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'jej-pages-to-ce' into 'master'	Douwe Maan	2017-02-06	11	-39/+269
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding GitLab Pages to CE Closes #14605, gitlab-com/infrastructure#1058, gitlab-ee#1333, and #323 See merge request !8463
\| * \| \| \| \|	Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ce	James Edwards-Jones	2017-02-06	15	-50/+525
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \|	Merge branch 'master' into jej-pages-picked-from-ee	James Edwards-Jones	2017-02-03	44	-222/+618
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Ported max_pages_size in settings API to CE	James Edwards-Jones	2017-02-02	1	-1/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add missing gitlab-pages related vars in init.d/gitlab	Achilleas Pipinellis	2017-01-31	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Simplify NGINX server_name regex	Achilleas Pipinellis	2017-01-31	2	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	chmod 644 gitlab.default.example	Achilleas Pipinellis	2017-01-31	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No need to be executable since it is sourced in /etc/init.d/gitlab
\| * \| \| \| \| \|	Set pages daemon to false	Achilleas Pipinellis	2017-01-31	1	-5/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add missing variables for gitlab-pages	Achilleas Pipinellis	2017-01-31	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \|	Change the pages daemon proxy listen port to 8090	Achilleas Pipinellis	2017-01-31	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So as to be consistent with what is set in Omnibus
\| * \| \| \| \| \|	Change NGINX pages configs to account for the Pages daemon	Achilleas Pipinellis	2017-01-31	2	-19/+15
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add init scripts for GitLab Pages daemon	Achilleas Pipinellis	2017-01-31	2	-7/+78
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix confusing implementation detail in nginx config about how gitlab-pages ↵	Kamil Trzcinski	2017-01-31	2	-6/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	work [ci skip]
\| * \| \| \| \| \|	Bring back GitLab Pages SSL config	Kamil Trzcinski	2017-01-31	2	-0/+84
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Rename pages namespace or project path when changed	Kamil Trzcinski	2017-01-31	3	-29/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Move UploadsTransfer to ProjectTransfer and inherit from this to UploadsTransfer and PagesTransfer
\| * \| \| \| \| \|	Revert "Store pages in shared/pages/fqdn/fqdn/public or ↵	Kamil Trzcinski	2017-01-31	2	-87/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	shared/pages/fqdn/subpath/public - makes it simpler to implement CNAMEs in future" This reverts commit 86a2a78f0d13a678899460638add6b862059433e.