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

	Commit message (Collapse)	Author	Age	Files	Lines
*	adding notifications stuff and more refactoring for exporting projects	James Lopez	2016-06-14	13	-29/+84
\|
*	new export stuff and view	James Lopez	2016-06-14	4	-12/+26
\|
*	lots of refactoring to reuse import service	James Lopez	2016-06-14	15	-179/+143
\|
*	Merge branches 'feature/project-export-ui-experimental' and ↵	James Lopez	2016-06-14	8	-35/+95
\|\ \| \| \| \| \| \|	'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
\| *	updated relation_factory based on MR feedback	James Lopez	2016-06-14	1	-3/+3
\| \|
\| *	fix merge	James Lopez	2016-06-14	2	-6/+6
\| \|
\| *	Merge branches 'feature/project-export' and 'feature/project-import' of ↵	James Lopez	2016-06-14	6	-31/+91
\| \|\ \| \| \| \| \| \| \| \| \|	gitlab.com:gitlab-org/gitlab-ce into feature/project-import
\| \| *	missed line break	James Lopez	2016-06-14	1	-0/+1
\| \| \|
\| \| *	better coverage for Reader	James Lopez	2016-06-14	1	-0/+61
\| \| \|
\| \| *	few changes based on MR feedback	James Lopez	2016-06-13	3	-3/+3
\| \| \|
\| \| *	fix file.write	James Lopez	2016-06-13	1	-3/+1
\| \| \|
* \| \|	WIP - starting refactoring import/export to use services	James Lopez	2016-06-13	5	-8/+55
\| \| \|
* \| \|	Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce ↵	James Lopez	2016-06-13	4	-34/+40
\|\ \ \ \| \|/ / \| \| \| \| \| \|	into feature/project-export-ui-experimental
\| * \|	refactored notes logic	James Lopez	2016-06-13	1	-3/+5
\| \| \|
\| * \|	few more changes based on feedback	James Lopez	2016-06-13	4	-17/+26
\| \| \|
\| * \|	addressing MR feedback, few changes to members mapper	James Lopez	2016-06-13	1	-15/+10
\| \| \|
* \| \|	Merge branches 'feature/project-export-ui-experimental' and ↵	James Lopez	2016-06-13	3	-3/+3
\|\ \ \ \| \|/ / \| \| \| \| \| \|	'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
\| * \|	corrected a few warnings	James Lopez	2016-06-13	3	-3/+3
\| \| \|
* \| \|	fix gemfile	James Lopez	2016-06-13	1	-2/+2
\| \| \|
* \| \|	Merge branches 'feature/project-export-ui-experimental' and ↵	James Lopez	2016-06-13	1841	-12581/+33110
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental # Conflicts: # Gemfile.lock # app/helpers/todos_helper.rb # app/models/todo.rb # app/views/projects/edit.html.haml # lib/gitlab/import_export/import_service.rb
\| * \|	Merge branches 'feature/project-export' and 'feature/project-import' of ↵	James Lopez	2016-06-13	1	-1/+1
\| \|\ \ \| \| \|/ \| \| \| \| \| \|	gitlab.com:gitlab-org/gitlab-ce into feature/project-import
\| \| *	fixed deprecation warning	James Lopez	2016-06-13	1	-1/+1
\| \| \|
\| * \|	fixed specs and refactored a few things due to recent model changes and ↵	James Lopez	2016-06-13	5	-314/+158
\| \| \| \| \| \| \| \| \| \| \| \|	merge conflicts
\| * \|	Merge branches 'feature/project-export' and 'feature/project-import' of ↵	James Lopez	2016-06-13	1830	-12102/+32805
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab.com:gitlab-org/gitlab-ce into feature/project-import # Conflicts: # app/models/project.rb # db/schema.rb # lib/gitlab/import_export/import_export_reader.rb
\| \| *	added comments to import export reader class	James Lopez	2016-06-13	1	-0/+29
\| \| \|
\| \| *	refactored loads of things due to commits to pipeline change	James Lopez	2016-06-13	5	-20/+26
\| \| \|
\| \| *	few more modifications based on comments	James Lopez	2016-06-13	2	-7/+12
\| \| \|
\| \| *	Merge branches 'feature/project-export' and 'master' of ↵	James Lopez	2016-06-13	874	-4424/+13035
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	gitlab.com:gitlab-org/gitlab-ce into feature/project-export
\| \| \| *	Merge branch 'bug/svg_sanitizer' into 'master'	Robert Speicher	2016-06-13	3	-13/+130
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve SVG sanitizer to handle namespaced attributes * Small refactor in the SVG sanitizer * Enable already whitelisted namespaced attributes to be allowed * Disable `xlink:href`to reference any external resource Fixes #18100 See merge request !4427
\| \| \| \| *	Improved SVG sanitizer specs to include smoke tests for clean.bug/svg_sanitizer	Gabriel Mazetto	2016-06-12	1	-0/+16
\| \| \| \| \|
\| \| \| \| *	Refactored SVG sanitizer	Gabriel Mazetto	2016-06-12	2	-24/+41
\| \| \| \| \|
\| \| \| \| *	Added SVG sanitizer fix to the changelog	Gabriel Mazetto	2016-06-12	1	-0/+1
\| \| \| \| \|
\| \| \| \| *	Refactor SVG sanitizer and prevent `xlink:href` to refer to external resources	Gabriel Mazetto	2016-06-12	2	-8/+30
\| \| \| \| \|
\| \| \| \| *	Fix SVG whitelisting to allow namespaced attributes	Gabriel Mazetto	2016-06-12	2	-5/+66
\| \| \| \|/
\| \| \| *	Merge branch 'fix-closes-issues-error-500' into 'master'	Robert Speicher	2016-06-12	6	-2/+42
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500 when using closes_issues API with an external issue tracker Closes #18484 See merge request !4608
\| \| \| \| *	Fix Error 500 when using closes_issues API with an external issue tracker	Stan Hu	2016-06-11	6	-2/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #18484
\| \| \| * \|	Merge branch 'nav-offscreen-dz-patch' into 'master'	Dmitriy Zaporozhets	2016-06-11	5	-27/+3
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improvements to offscreen navigation Improvements on top of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4579 based on mockups from https://gitlab.com/gitlab-org/gitlab-ce/issues/18417#note_12389766 See merge request !4607
\| \| \| \| * \|	Center layout navigation and remove iconsnav-offscreen-dz-patch	Dmitriy Zaporozhets	2016-06-11	5	-27/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| \| * \| \|	Merge branch '18417-nav-offscreen' into 'master'	Dmitriy Zaporozhets	2016-06-11	18	-182/+130
\| \| \| \|\ \ \ \| \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Hide Left sidebar paradigm" ## What does this MR do? Hides the nav bar by default & centers the tanuki logo in the top nav ## Why was this MR needed? UX ## What are the relevant issue numbers? Closes #18417 ## Screenshots (if relevant) ![Screen_Shot_2016-06-10_at_12.49.10_PM](/uploads/c281e4c9de1c1bc9af59ebfa8d2bd18b/Screen_Shot_2016-06-10_at_12.49.10_PM.png) ![Screen_Shot_2016-06-10_at_12.49.27_PM](/uploads/635e0a88230105faa5527f6632899ddb/Screen_Shot_2016-06-10_at_12.49.27_PM.png) <img src="/uploads/3001a9c723037012f1b86cfacfb1225e/Screen_Shot_2016-06-10_at_12.51.41_PM.png" width="500px"> See merge request !4579
\| \| \| \| * \|	Fix preferences_spec test18417-nav-offscreen	Annabel Dunstone	2016-06-10	3	-8/+6
\| \| \| \| \| \|
\| \| \| \| * \|	Add back sidebar counters and username	Annabel Dunstone	2016-06-10	9	-15/+33
\| \| \| \| \| \|
\| \| \| \| * \|	Fix safari logo loading animation safari bug	Annabel Dunstone	2016-06-10	2	-8/+1
\| \| \| \| \| \|
\| \| \| \| * \|	Revert side nav to full width; remove border under nav; remove tooltips on ↵	Annabel Dunstone	2016-06-10	12	-145/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nav links; stop page content shifting with side nav; put project nav in container
\| \| \| \| * \|	Update media queries	Annabel Dunstone	2016-06-10	1	-3/+3
\| \| \| \| \| \|
\| \| \| \| * \|	Fix profile test	Annabel Dunstone	2016-06-10	2	-1/+2
\| \| \| \| \| \|
\| \| \| \| * \|	Fix logo at all screen widths, update sidebar text	Annabel Dunstone	2016-06-10	7	-56/+78
\| \| \| \| \| \|
\| \| \| \| * \|	Move tanuki icon to center of nav bar; keep nav closed by default; remove ↵	Annabel Dunstone	2016-06-10	8	-36/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	collapsed nav cookie
\| \| \| * \| \|	Merge branch '18463-search-form-padding-is-too-damn-high' into 'master'	Dmitriy Zaporozhets	2016-06-11	1	-1/+0
\| \| \| \|\ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed search form padding ## What does this MR do? Corrects the padding of the search form. ## Are there points in the code the reviewer needs to double check? Ney. ## Why was this MR needed? UX ## What are the relevant issue numbers? Closes #18463. ## Screenshots (if relevant) ![Screen_Shot_2016-06-10_at_14.07.32](/uploads/e4d127c66cf7fa3286279367d6e4ea7c/Screen_Shot_2016-06-10_at_14.07.32.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - [ ] Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4591
\| \| \| \| * \|	Fixed search form padding	Luke "Jared" Bennett	2016-06-10	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated CHANGELOG Removed CHANGELOG entry
\| \| \| * \| \|	Merge branch 'create-backup-dir-for-local' into 'master'	Robert Speicher	2016-06-10	1	-3/+18
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only create the backup directory if it is local Closes #12710 See merge request !4551