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

	Commit message (Collapse)	Author	Age	Files	Lines
*	fix spacingfix/encoding-binary-issue	James Lopez	2017-06-06	1	-1/+1
\|
*	fix spacing and wording	James Lopez	2017-06-06	1	-3/+3
\|
*	fix encoding issue and add changelog	James Lopez	2017-06-06	2	-1/+5
\|
*	add spec to replicate encoding problem	James Lopez	2017-06-06	1	-2/+13
\|
*	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 ↵	Phil Hughes	2017-06-06	10	-17/+95
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'24032-when-changing-project-visibility-setting-change-other-dropdowns-automatically' into 'master' Resolve "When changing project visibility setting, change other dropdowns automatically" Closes #24032 See merge request !11831
\| * \| \| \| \| \|	Resolve "When changing project visibility setting, change other dropdowns ↵	Mike Greiling	2017-06-06	10	-17/+95
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	automatically"
* \| \| \| \| \|	Merge branch 'issue-23254' into 'master'	Rémy Coutable	2017-06-06	3	-8/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup style of confirmation page See merge request !11774
\| * \| \| \| \| \|	Fixed style on unsubscribe page	Gustav Ernberg	2017-06-03	3	-8/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed unnecassary logic Added missing 'the' Fix case Fixed specs
* \| \| \| \| \| \|	Merge branch 'sh-fix-typo-user-activity-service' into 'master'	Rémy Coutable	2017-06-06	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in user activity debug log message See merge request !11898
\| * \| \| \| \| \| \|	Fix typo in user activity debug log messagesh-fix-typo-user-activity-service	Stan Hu	2017-06-03	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '29690-rotate-otp-key-base' into 'master'	Brian Neel	2017-06-06	5	-0/+256
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-0/+256
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'pull-mirror-overhaul-ce-backport' into 'master'	Douwe Maan	2017-06-05	15	-71/+143
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	backports changed import logic from pull mirroring feature into CE See merge request !11850
\| * \| \| \| \| \| \| \|	backports changed import logic from pull mirroring feature into CE	Tiago Botelho	2017-06-05	15	-71/+143
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch ↵	Robert Speicher	2017-06-05	1	-1/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'33321-spec-failure-in-spec-javascripts-pipelines-header_component_spec-js-46-expected-failed-pipeline-123-triggered-4-weeks-ago-by-foo-to-equal-failed-pipeline-123-triggered-3-weeks-ago-by-foo' into 'master' Resolve "Spec failure in spec/javascripts/pipelines/header_component_spec.js:46 : Expected 'failed Pipeline #123 triggered 4 weeks ago by Foo' to equal 'failed Pipeline #123 triggered 3 weeks ago by Foo'." Closes #33321 See merge request !11915
\| * \| \| \| \| \| \| \| \|	Fix header component spec33321-spec-failure-in-spec-javascripts-pipelines-header_component_spec-js-46-expected-failed-pipeline-123-triggered-4-weeks-ago-by-foo-to-equal-failed-pipeline-123-triggered-3-weeks-ago-by-foo	Clement Ho	2017-06-05	1	-1/+4
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'mk-fix-git-over-http-rejections' into 'master'	Douwe Maan	2017-06-05	18	-537/+887
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Git-over-HTTP rejections See merge request !11398
\| * \| \| \| \| \| \| \| \|	Remove unnecessary variablemk-fix-git-over-http-rejections	Michael Kozono	2017-06-05	1	-3/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add changelog entry	Michael Kozono	2017-06-05	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Extract and memoize `user_access`	Michael Kozono	2017-06-05	1	-6/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because it is sometimes never used.
\| * \| \| \| \| \| \| \| \|	Remove GitAccessStatus (no longer needed)	Michael Kozono	2017-06-05	4	-26/+9
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Refactor construction of response	Michael Kozono	2017-06-05	2	-14/+22
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Refactor to remove a special case	Michael Kozono	2017-06-05	3	-7/+29
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix would-be regression	Michael Kozono	2017-06-05	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/commit/57e3e942de1adef2c8621905370f07d7da7870c4 I changed it to a separate condition rather than depending on the order of the case-when statements to prevent this mistake again.
\| * \| \| \| \| \| \| \| \|	Clarify error messages	Michael Kozono	2017-06-05	3	-13/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And refactor to self-document a little better.
\| * \| \| \| \| \| \| \| \|	Refactor to let GitAccess errors bubble up	Michael Kozono	2017-06-05	9	-203/+182
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No external behavior change. This allows `GitHttpController` to set the HTTP status based on the type of error. Alternatively, we could have added an attribute to GitAccessStatus, but this pattern seemed appropriate.
\| * \| \| \| \| \| \| \| \|	Refactor to let `GitAccess` check protocol config	Michael Kozono	2017-06-05	1	-10/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This already works due to previous refactoring.
\| * \| \| \| \| \| \| \| \|	Specify new Git-LFS-over-HTTP behavior	Michael Kozono	2017-06-05	1	-18/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes to `GitHttpClientController`’s authentication logic caused this behavior change. The old 401 Unauthorized statuses didn’t cause any harm, but they weren’t quite as accurate as the new behavior.
\| * \| \| \| \| \| \| \| \|	Move CI access logic into GitAccess	Michael Kozono	2017-06-05	7	-57/+198
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Refactor	Michael Kozono	2017-06-05	2	-10/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Check disabled commands in GitAccess instead	Michael Kozono	2017-06-05	3	-6/+68
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Render GitAccess message if authorized	Michael Kozono	2017-06-05	1	-5/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix Git over HTTP spec	Michael Kozono	2017-06-05	5	-269/+419
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* The spec has 7 failures at this point * Specify rendered error messages * Render the GitAccess message rather than “Access denied” * Render the Not Found message provided by GitAccess, instead of a custom one * Expect GitAccess to check the config for whether Git-over-HTTP pull or push is disabled, rather than doing it in the controller * Add more thorough testing for authentication * Dried up a lot of tests * Fixed some broken tests
* \| \| \| \| \| \| \| \|	Merge branch 'added_chinese_for_i18n' into 'master'	Douwe Maan	2017-06-05	11	-1/+686
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Chinese translation of Cycle Analytics Page to I18N See merge request !11644
\| * \ \ \ \ \ \ \ \	added changelog for Chinese translations	黄涛	2017-06-05	1	-0/+4
\| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Optimize translation content	黄涛	2017-05-31	6	-87/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Optimize the translation of zh-TW 2. Synchronous zh-CN, zh-HK translation
\| \| * \| \| \| \| \| \| \| \|	Update i18n.rb Indent style	Huang Tao	2017-05-27	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Add translation zh_TW to I18N	黄涛	2017-05-27	4	-1/+228
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Add translation zh_HK to I18N	黄涛	2017-05-27	4	-1/+228
\| \| \| \| \| \| \| \| \| \| \|