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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Move branches docs to new location and copyeditdocs/branches	Achilleas Pipinellis	2017-06-16	4	-7/+9
\|
*	Document the Delete Merged Branches functionality	Mark Fletcher	2017-06-08	4	-0/+18
\| \| \| \|	* Note that protected branches will not be part of the deletion
*	Merge branch 'evn-crosslink-to-architecture' into 'master'	Achilleas Pipinellis	2017-06-06	1	-3/+5
\|\ \| \| \| \| \| \| \| \|	Make sketch dynamic and link back to production architecture See merge request !11617
\| *	Per discussionevn-crosslink-to-architecture	Ernst van Nierop	2017-05-22	1	-1/+1
\| \|
\| *	Make sketch dynamic and link back to production architecture	ernstvn	2017-05-22	1	-3/+5
\| \|
* \|	Remove references to old settings location	Achilleas Pipinellis	2017-06-06	7	-32/+14
\| \|
* \|	Resolve "API: Environment info missed"	Sébastien	2017-06-06	2	-0/+1
\| \|
* \|	Merge branch '32236-fix-typo-in-helm-chart-installation-doc' into 'master'	Achilleas Pipinellis	2017-06-06	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in helm chart installation doc (#32236) Closes #32236 See merge request !11891
\| * \|	Fix typo on namespace	Sébastien	2017-06-03	1	-2/+2
\| \| \|
* \| \|	Merge branch 'dz-backport-codeclimate-docs' into 'master'	Achilleas Pipinellis	2017-06-06	1	-3/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport CI codeclimate example doc change from EE See merge request !11903
\| * \| \|	Fix link to ee code quality docdz-backport-codeclimate-docs	Dmitriy Zaporozhets	2017-06-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Backport CI codeclimate example doc change from EE	Dmitriy Zaporozhets	2017-06-05	1	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'add-note-on-body-size' into 'master'	Achilleas Pipinellis	2017-06-06	1	-1/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note on customizing body size to support Registry See merge request !11904
\| * \| \| \|	Update gitlab_chart.mdadd-note-on-body-size	Joshua Lambert	2017-06-05	1	-1/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'patch-23' into 'master'	Achilleas Pipinellis	2017-06-06	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Corrected spelling mistake in permissions.md "it total" -> "in total". See merge request !11908
\| * \| \| \| \|	Corrected spelling mistake in permissions.md "it total" -> "in total".	Andrew Featherstone	2017-06-05	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs/fix-headings-for-seo' into 'master'	Achilleas Pipinellis	2017-06-06	1	-4/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issues documentation: improve SEO See merge request !11919
\| * \| \| \| \| \|	change headings to improve SEOdocs/fix-headings-for-seo	Marcia Ramos	2017-06-06	1	-4/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '29690-rotate-otp-key-base' into 'master'	Brian Neel	2017-06-06	1	-0/+79
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a Rake task to aid in rotating otp_key_base Closes #29690 See merge request !11881
\| * \| \| \| \| \|	Add a Rake task to aid in rotating otp_key_base	Nick Thomas	2017-06-05	1	-0/+79
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Support hard deletion in Admin::UsersController#destroy	Nick Thomas	2017-06-05	1	-1/+2
\|/ / / / / /
* \| \| \| \| \|	Merge branch '31061-26135-ci-project-slug-enviroment-variables' into 'master'	Kamil Trzciński	2017-06-05	1	-1/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add slugified project path to CI environment variables Closes #31061 See merge request !11838
\| * \| \| \| \|	Add slugify project path to CI enviroment variables	vanadium23	2017-06-03	1	-1/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '25680-CI_ENVIRONMENT_URL' into 'master'	Kamil Trzciński	2017-06-05	2	-0/+7
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `$CI_ENVIRONMENT_URL` as a job variable Closes #25680 See merge request !11695
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URL	Lin Jen-Shin	2017-06-02	9	-21/+126
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (39 commits) Resolve "Improve Container Registry description" Add username parameter to gravatar URL Fix replying to a commit discussion displayed in the context of an MR Add fog-aliyun as backup storage provider Add missing specs Make sure protected can't be null; Test protected! Update session cookie key name to be unique to instance in development Just mention which GitLab version is required Fix data inconsistency issue for old artifacts by moving them to a currently used path Fix N+1 queries for non-members in comment threads Fix rubocop in spec/helpers/diff_helper_spec.rb Merge two items into one in the doc Only remove FK if it exists Maintain notes avatar at smaller breakpoint Fix pipeline schedule value name in documentation Add test for Project#protected_for? Update diff discussion position per discussion instead of per note Display Shared Runner status in Admin Dashboard Make sure we're loading the fresh variables Now secret_variables_for would return the variables ...
\| * \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URL	Lin Jen-Shin	2017-06-01	12	-18/+699
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (251 commits) Don't match email addresses or foo@bar as user references Revert "Update GITLAB_SHELL_VERSION" Update GITLAB_SHELL_VERSION Add feature toggles through Flipper Change no_limits to limits Move includes call to scope Add GitLab Resources to University Add Documentation for GIT_CHECKOUT variable Remove entry variable Do not try to preload Commits when using Note.includes(:noteable) Ui improvements for count badges and permission badges Rename the other jobs Update jobs_spec for changes from builds_spec Introduce source to pipeline entity Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions ...
\| * \ \ \ \ \ \	Merge branch 'master' into '25680-CI_ENVIRONMENT_URL'	Lin Jen-Shin (godfat)	2017-05-26	11	-8/+78
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \| \|	Pass external_url from environment if job doesn't have one	Lin Jen-Shin	2017-05-25	2	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also update the document and add a changelog entry
* \| \| \| \| \| \| \|	Resolve "Documentation of `.gitlab-ci.yml` states incorrect example for ↵	Sébastien	2017-06-04	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	variables"
* \| \| \| \| \| \| \|	Merge branch '31943-document-go-18' into 'master'	Achilleas Pipinellis	2017-06-03	2	-16/+35
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document go1.8.3 as dependency See merge request !11245
\| * \| \| \| \| \| \|	Go 1.8.3 and Upgrade-9.3 doc	Kim "BKC" Carlbäcker	2017-06-02	2	-12/+32
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Document go1.8.1 as dependency	Kim "BKC" Carlbäcker	2017-06-02	1	-8/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'projects-api-import-status' into 'master'	Douwe Maan	2017-06-02	1	-0/+11
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose import_status in Projects API Closes #19646 See merge request !11851
\| * \| \| \| \| \| \| \|	Expose import_status in Projects API	Robin Bobbitt	2017-06-02	1	-0/+11
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'mabes/gitlab-ce-bypass-auto-login' into 'master'	Douwe Maan	2017-06-02	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow manual bypass of auto_sign_in_with_provider Closes #3786 See merge request !11884
\| * \| \| \| \| \| \| \| \|	Allow manual bypass of auto_sign_in_with_providermabes/gitlab-ce-bypass-auto-login	Maxime Besson	2017-06-02	1	-0/+3
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit lets a user bypass the automatic signin on the login form, in order to login with a technical (admin, etc) account Closes #3786 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch '28694-hard-delete-user-from-api' into 'master'	Douwe Maan	2017-06-02	2	-5/+17
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow users to be hard-deleted from the API See merge request !11853
\| * \| \| \| \| \| \| \| \|	Allow users to be hard-deleted from the API	Nick Thomas	2017-06-02	2	-5/+17
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Fixed typo: craeted -> created	denisroy	2017-06-02	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'update-installation-docs-with-i18n' into 'master'	Douwe Maan	2017-06-02	1	-0/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add section to compile GetText files for source installations See merge request !11865
\| * \| \| \| \| \| \| \|	Add section to compile GetText files for source installationsupdate-installation-docs-with-i18n	Ruben Davila	2017-06-01	1	-0/+4
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'patch-23' into 'master'	Sean Packham	2017-06-02	1	-6/+6
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rephrase to enhance readability and some minor grammar in gitlab_flow.md See merge request !11767
\| * \| \| \| \| \| \|	Rephrase to enhance readability. And some minor grammar.	renzo	2017-05-29	1	-6/+6
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Add new Rake task to simplify the compilation of PO filesadd-new-rake-task-for-gettext	Ruben Davila	2017-06-01	1	-2/+1
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'yuanfeiz/gitlab-ce-aliyun-backup-provider' into 'master'	Rémy Coutable	2017-06-01	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add fog-aliyun as backup storage provider See merge request !11849
\| * \| \| \| \| \|	Add fog-aliyun as backup storage provideryuanfeiz/gitlab-ce-aliyun-backup-provider	Yuanfei Zhu	2017-06-01	1	-1/+1
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'dm-gravatar-username' into 'master'	Sean McGivern	2017-06-01	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add username parameter to gravatar URL Closes #24472 See merge request !11741
\| * \| \| \| \| \|	Add username parameter to gravatar URL	Douwe Maan	2017-06-01	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '24196-protected-variables' into 'master'	Kamil Trzciński	2017-06-01	2	-15/+37
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implementation for protected variables Closes #24196 See merge request !11688
\| * \| \| \| \| \| \|	Just mention which GitLab version is required	Lin Jen-Shin	2017-06-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11688/diffs#note_31277454