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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix overlap of right-sidebar and wiki create page form39509-fix-wiki-create-sidebar-overlap	Eric Eastwood	2017-10-31	1	-5/+1
\| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39509
*	Merge branch 'non-existing-repo-optimization' into 'master'	Douwe Maan	2017-10-26	1	-2/+7
\|\ \| \| \| \| \| \| \| \|	Avoid calling underlying methods on non-existing repos See merge request gitlab-org/gitlab-ce!14962
\| *	Avoid calling underlying methods on non-existing reposnon-existing-repo-optimization	Alejandro Rodríguez	2017-10-20	1	-2/+7
\| \| \| \| \| \| \| \|	This saves us Rugged/gRPC invocations
* \|	Merge branch 'api-configure-jira' into 'master'	Douwe Maan	2017-10-26	1	-0/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Validate username/pw for Jiraservice, require them in the API Closes #36621 See merge request gitlab-org/gitlab-ce!15025
\| * \|	Validate username/pw for Jiraservice, require them in the API	Robert Schilling	2017-10-24	1	-0/+2
\| \| \|
* \| \|	Added ssh fingerprint, gitlab ci and pages information in an instance ↵	Francisco Lopez	2017-10-25	8	-0/+198
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	configuration page Closes #25142
* \| \|	Merge branch '38178-fl-mr-notes-components' into 'master'	Phil Hughes	2017-10-25	5	-12/+56
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-12/+56
\| \| \|/ \| \|/\| \| \| \| \| \| \|	them easier to reuse in MR and Snippets comments
* \| \|	Merge branch 'gitaly-ff-merge-preparation' into 'master'	Rémy Coutable	2017-10-25	1	-14/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-14/+4
\| \|/ / \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \| \|
* \| \| \|	Resolve "Remove overzealous tooltips in projects page tabs"	Victor Wu	2017-10-25	1	-3/+3
\| \| \| \|
* \| \| \|	Remove filter icon from search bar32318-filter-icon	Annabel Dunstone Gray	2017-10-24	2	-13/+1
\| \| \| \|
* \| \| \|	Merge branch 'jramsay-remove-superfluous-namespace' into 'master'	Douwe Maan	2017-10-24	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'suggest-rename-origin' into 'master'	Sean McGivern	2017-10-24	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Suggest to rename the remote for existing repositories See merge request gitlab-org/gitlab-ce!14970
\| * \| \| \| \|	Suggest to rename the remote for existing repositories	Herman van Rink	2017-10-20	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'sh-fix-environment-write-ref' into 'master'	Grzegorz Bizon	2017-10-24	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-4/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Pages API" Closes #23000 See merge request gitlab-org/gitlab-ce!13917
\| * \| \| \| \| \| \|	Rename conflicting private method in PagesDomain model	Travis Miller	2017-10-22	1	-4/+4
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'bvl-circuitbreaker-backoff' into 'master'	Sean McGivern	2017-10-24	4	-13/+47
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Circuitbreaker backoff and retries Closes #37383 and #38231 See merge request gitlab-org/gitlab-ce!14933
\| * \| \| \| \| \| \|	Implement backoff for the circuitbreaker	Bob Van Landuyt	2017-10-23	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-10/+45
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'ph-multi-file-editor-new-file-folder-dropdown' into 'master'	Filipa Lacerda	2017-10-24	18	-32/+345
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	9	-12/+208
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	spec fixes	Phil Hughes	2017-10-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	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	2	-4/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fixed failing title test	Phil Hughes	2017-10-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fixed bug with tabs not switching correctly	Phil Hughes	2017-10-23	6	-12/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	clears all tmp files after cancelling edit mode
\| * \| \| \| \| \| \| \| \|	failing spec fixes	Phil Hughes	2017-10-23	5	-30/+31
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	correctly creates file in currently viewed directory	Phil Hughes	2017-10-23	4	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	specs
\| * \| \| \| \| \| \| \| \|	changed adding temp files/directories code to match new structure	Phil Hughes	2017-10-23	2	-20/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this uses the new data structure of adding into the different arrays which makes the code a lot easier to work with. Some changes need to be made around commiting & changing the content. [ci skip]
\| * \| \| \| \| \| \| \| \|	fixed new file/directory modal using methods that no longer exist	Phil Hughes	2017-10-23	3	-46/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Add new files & directories in the multi-file editor	Phil Hughes	2017-10-23	12	-32/+257
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #38614
* \| \| \| \| \| \| \| \| \|	Merge branch 'hide-pipeline-zero-duration' into 'master'	Grzegorz Bizon	2017-10-24	1	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hides pipeline duration in commit box when it is zero (nil) Closes #32788 See merge request gitlab-org/gitlab-ce!14979
\| * \| \| \| \| \| \| \| \| \|	Hides pipeline duration in commit box when it is zero (nil)	Guilherme Vieira	2017-10-20	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'remove-new-sidebar-stuff' into 'master'	Phil Hughes	2017-10-24	7	-43/+37
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up `new-sidebar` See merge request gitlab-org/gitlab-ce!14978
\| * \| \| \| \| \| \| \| \| \| \|	Rename new_sidebar in JSremove-new-sidebar-stuff	Annabel Dunstone Gray	2017-10-20	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove variables from sidebar CSS	Annabel Dunstone Gray	2017-10-20	2	-22/+20
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Replace all instances of new-sidebar with contextual-sidebar	Annabel Dunstone Gray	2017-10-20	4	-18/+14
\| \| \|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-unresolve-btn-jump-color' into 'master'	Phil Hughes	2017-10-24	2	-2/+5
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix code review discussion action buttons Closes #38891 See merge request gitlab-org/gitlab-ce!14801
\| * \| \| \| \| \| \| \| \| \| \|	Fix icon color and btn-group alignment of discussion buttonsfix-unresolve-btn-jump-color	Annabel Dunstone Gray	2017-10-23	2	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sticky-perf' into 'master'	Filipa Lacerda	2017-10-24	4	-10/+16
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix performance of sticky.js Closes #39332 See merge request gitlab-org/gitlab-ce!14976
\| * \| \| \| \| \| \| \| \| \| \|	fixed karma testssticky-perf	Phil Hughes	2017-10-23	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	calculate the stickyTop instead of hard coding a variable	Phil Hughes	2017-10-23	3	-4/+13
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix performance of sticky.js	Phil Hughes	2017-10-23	2	-7/+3
\| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #39332