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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Make local_branches OPT_OUTan/local_branches_opt_out	Andrew Newdigate	2017-10-26	1	-1/+1
\|
*	Merge branch '38178-fl-mr-notes-components' into 'master'	Phil Hughes	2017-10-25	10	-39/+94
\|\ \| \| \| \| \| \| \| \|	Moves placeholders components into shared folder with documentation. See merge request gitlab-org/gitlab-ce!14964
\| *	Moves placeholders components into shared folder with documentation. Makes ↵38178-fl-mr-notes-components	Filipa Lacerda	2017-10-19	10	-39/+94
\| \| \| \| \| \| \| \|	them easier to reuse in MR and Snippets comments
* \|	Merge branch 'gitaly-ff-merge-preparation' into 'master'	Rémy Coutable	2017-10-25	4	-18/+68
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move all rugged operation for ff_merge inside Gitlab::Git Closes gitaly#683 See merge request gitlab-org/gitlab-ce!15011
\| * \|	Move all rugged operation for ff_merge inside Gitlab::Gitgitaly-ff-merge-preparation	Alejandro Rodríguez	2017-10-24	4	-18/+68
\| \|/ \| \| \| \| \| \|	We also delete some unused code related to the aforementioned feature.
* \|	Merge branch '35199-case-insensitive-branches-search' into 'master'	Sean McGivern	2017-10-25	3	-1/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add case insensitive branches search Closes #35199 See merge request gitlab-org/gitlab-ce!14995
\| * \|	Add case insensitive branches search	George Andrinopoulos	2017-10-23	3	-1/+15
\| \| \|
* \| \|	Merge branch '39419-remove-overzealous-tooltips-in-projects-page-tabs' into ↵	Sean McGivern	2017-10-25	2	-3/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Remove overzealous tooltips in projects page tabs" Closes #39419 See merge request gitlab-org/gitlab-ce!15017
\| * \| \|	Resolve "Remove overzealous tooltips in projects page tabs"	Victor Wu	2017-10-25	2	-3/+8
\|/ / /
* \| \|	Merge branch '32318-filter-icon' into 'master'	Phil Hughes	2017-10-25	3	-13/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove filter icon from search bar Closes #32318 See merge request gitlab-org/gitlab-ce!14966
\| * \| \|	Remove filter icon from search bar32318-filter-icon	Annabel Dunstone Gray	2017-10-24	3	-13/+6
\|/ / /
* \| \|	Merge branch 'jramsay-remove-superfluous-namespace' into 'master'	Douwe Maan	2017-10-24	2	-11/+68
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove superfluous namespace from cluster settings See merge request gitlab-org/gitlab-ce!14987
\| * \| \|	Remove superfluous namespace from cluster settingsjramsay-remove-superfluous-namespace	James Ramsay	2017-10-22	2	-11/+68
\| \| \| \|
* \| \| \|	Merge branch 'gitaly-gl-username' into 'master'	Douwe Maan	2017-10-24	8	-37/+34
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support `Gitaly::User`'s gl_username field See merge request gitlab-org/gitlab-ce!15016
\| * \| \| \|	Support `Gitaly::User`'s gl_username fieldgitaly-gl-username	Alejandro Rodríguez	2017-10-23	8	-37/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We also unify conversions from and to `Gitaly::User`s in the `Gitlab::Git::User` class.
* \| \| \| \|	Merge branch 'bvl-dont-rename-free-names' into 'master'	Douwe Maan	2017-10-24	2	-11/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't rename groups/projects that aren't reserved anymore Closes #39387 See merge request gitlab-org/gitlab-ce!15029
\| * \| \| \| \|	Don't rename groups/projects that aren't reserved anymorebvl-dont-rename-free-names	Bob Van Landuyt	2017-10-24	2	-11/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12932 we freed up some names. But we were still renaming them.
* \| \| \| \| \|	Merge branch 'sh-memoize-logger' into 'master'	Nick Thomas	2017-10-24	3	-2/+27
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Memoize GitLab logger to reduce open file descriptors Closes gitlab-ee#3664 See merge request gitlab-org/gitlab-ce!15007
\| * \| \| \| \| \|	Memoize GitLab logger to reduce open file descriptors	Stan Hu	2017-10-24	3	-2/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We see that in gitlab-org/gitlab-ee#3664 that if we log a lot of data in Sidekiq workers, the number of open file descriptors reaches over 1000. To avoid this, we can memoize the logger per thread via RequestStore. Closes gitlab-org/gitlab-ee#3664
* \| \| \| \| \| \|	Merge branch 'suggest-rename-origin' into 'master'	Sean McGivern	2017-10-24	2	-0/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Suggest to rename the remote for existing repositories See merge request gitlab-org/gitlab-ce!14970
\| * \| \| \| \| \| \|	Add changelog entry	Herman van Rink	2017-10-20	1	-0/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Suggest to rename the remote for existing repositories	Herman van Rink	2017-10-20	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'api-doc-group-statistics' into 'master'	Achilleas Pipinellis	2017-10-24	2	-0/+37
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update groups API documentation Closes #38922 See merge request gitlab-org/gitlab-ce!15024
\| * \| \| \| \| \| \| \|	Update groups API documentation	Robert Schilling	2017-10-24	2	-0/+37
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'sh-fix-environment-write-ref' into 'master'	Grzegorz Bizon	2017-10-24	3	-1/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the writing of invalid environment refs Closes #39182 See merge request gitlab-org/gitlab-ce!14993
\| * \| \| \| \| \| \| \|	Fix the writing of invalid environment refssh-fix-environment-write-ref	Stan Hu	2017-10-23	3	-1/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Environment names that contained a space would cause an error in GitLab 10.1 because a new guard clause was introduced in Repository#write_ref to prevent such references from existing. Use the slug instead to ensure that the name is valid. Closes #39182
* \| \| \| \| \| \| \| \|	Merge branch '23000-pages-api' into 'master'	Grzegorz Bizon	2017-10-24	10	-4/+782
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Pages API" Closes #23000 See merge request gitlab-org/gitlab-ce!13917
\| * \| \| \| \| \| \| \| \|	Add pages domains API implementation	Travis Miller	2017-10-22	3	-0/+122
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add pages domains API entities	Travis Miller	2017-10-22	1	-0/+17
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add pages domains API tests	Travis Miller	2017-10-22	1	-0/+440
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add pages domains API schema	Travis Miller	2017-10-22	1	-0/+23
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add pages domains API documentation	Travis Miller	2017-10-22	2	-0/+171
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Rename conflicting private method in PagesDomain model	Travis Miller	2017-10-22	1	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add Changelog	Travis Miller	2017-10-22	1	-0/+5
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'bvl-circuitbreaker-backoff' into 'master'	Sean McGivern	2017-10-24	19	-196/+275
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Circuitbreaker backoff and retries Closes #37383 and #38231 See merge request gitlab-org/gitlab-ce!14933
\| * \| \| \| \| \| \| \| \|	Allow enabling the circuitbreaker using an env variablebvl-circuitbreaker-backoff	Bob Van Landuyt	2017-10-23	3	-3/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	That way we can enable the circuitbreaker for just one host at a time.
\| * \| \| \| \| \| \| \| \|	Perform the stat check multiple times when checking a storage	Bob Van Landuyt	2017-10-23	4	-4/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of only checking once within a timeout, check multiple times within a timeout. That means with a timeout of 30 seconds and 3 retries. Each try would be allowed 20 seconds.
\| * \| \| \| \| \| \| \| \|	Implement backoff for the circuitbreaker	Bob Van Landuyt	2017-10-23	7	-190/+128
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The circuitbreaker now has 2 failure modes: - Backing off: This will raise the `Gitlab::Git::Storage::Failing` exception. Access to the shard is blocked temporarily. - Circuit broken: This will raise the `Gitlab::Git::Storage::CircuitBroken` exception. Access to the shard will be blocked until the failures are reset.
\| * \| \| \| \| \| \| \| \|	Allow configuring new circuitbreaker settings from the UI and API	Bob Van Landuyt	2017-10-23	7	-11/+64
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add new circuitbreaker properties to application_settings	Bob Van Landuyt	2017-10-23	3	-1/+25
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'ph-multi-file-editor-new-file-folder-dropdown' into 'master'	Filipa Lacerda	2017-10-24	25	-52/+708
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add new files & directories in the multi-file editor Closes #38614 See merge request gitlab-org/gitlab-ce!14839
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into ph-multi-file-editor-new-file-folder-dropdownph-multi-file-editor-new-file-folder-dropdown	Phil Hughes	2017-10-23	17	-12/+520
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	spec fixes	Phil Hughes	2017-10-23	4	-139/+146
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	moved to eventHub to manage creating new files	Phil Hughes	2017-10-23	7	-50/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removed an ID from the CSS
\| * \| \| \| \| \| \| \| \| \| \|	fixed eslint :see_no_evil:	Phil Hughes	2017-10-23	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	added feature spec	Phil Hughes	2017-10-23	5	-4/+107
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	fixed failing title test	Phil Hughes	2017-10-23	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	fixed bug with tabs not switching correctly	Phil Hughes	2017-10-23	7	-13/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	clears all tmp files after cancelling edit mode
\| * \| \| \| \| \| \| \| \| \| \|	failing spec fixes	Phil Hughes	2017-10-23	6	-47/+42
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	correctly creates file in currently viewed directory	Phil Hughes	2017-10-23	7	-4/+250
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	specs