James Lopez
279915253c
fix issue with forked MRs
2016-05-16 15:29:14 +02:00
James Lopez
bd5b019a7c
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
2016-05-16 13:29:25 +02:00
James Lopez
504c186f71
fix version issue
2016-05-16 13:28:11 +02:00
James Lopez
360689bb58
fix version
2016-05-16 13:11:49 +02:00
James Lopez
c374700390
missing new line
2016-05-16 12:40:01 +02:00
James Lopez
51487575bc
added version check on import
2016-05-16 12:39:42 +02:00
James Lopez
8c478874f9
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
2016-05-16 12:09:18 +02:00
James Lopez
5777ad9a1f
adding versioning to export
2016-05-16 12:04:31 +02:00
James Lopez
834c953750
fix merge conflicts
2016-05-16 11:22:59 +02:00
James Lopez
f386d7a7b7
some changes based on MR feedback
2016-05-16 10:13:00 +02:00
James Lopez
bf81c588fd
fix issue with mapping members
2016-05-13 19:51:07 +02:00
James Lopez
41f9d9d9ca
Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
2016-05-13 17:40:33 +02:00
James Lopez
2dff04f24a
fixed TODOs left
2016-05-13 17:39:03 +02:00
James Lopez
2e1decd061
restricted actual member mapping to admins
2016-05-13 17:17:46 +02:00
James Lopez
1eb802cde3
fixed leaving comments on notes about missing authors
2016-05-13 16:25:27 +02:00
James Lopez
a868258269
update json and fix notes issue
2016-05-13 14:17:10 +02:00
James Lopez
25a1c6541a
add message to notes about missing author on import
2016-05-13 12:33:13 +02:00
James Lopez
78cd39e480
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
2016-05-12 14:34:07 +02:00
James Lopez
8165e52045
add author on notes to export - so we can add to a note if project member is not found
2016-05-12 14:27:41 +02:00
James Lopez
3b7e5df890
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
2016-05-12 11:30:05 +02:00
James Lopez
b2b7b38c94
fix rubocop warnings
2016-05-12 11:29:06 +02:00
James Lopez
ff56f7be62
fix importer issue
2016-05-12 11:03:55 +02:00
James Lopez
f06c5516db
fix issue in import_service
2016-05-12 10:57:28 +02:00
James Lopez
385d6df20c
typo
2016-05-12 10:39:59 +02:00
James Lopez
a61456e44e
refactored import to use shared error stuff and fixed a few issues with recent refactorings
2016-05-11 17:22:45 +02:00
James Lopez
27867f3542
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
2016-05-11 14:52:56 +02:00
James Lopez
cffae0d22e
fixing more export problems
2016-05-11 14:51:25 +02:00
James Lopez
a86da1b73b
Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
2016-05-11 13:21:34 +02:00
James Lopez
49e6fc40b9
fix bad refactor
2016-05-11 13:17:49 +02:00
James Lopez
6fa529e981
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
2016-05-10 17:18:04 +02:00
James Lopez
a5d59f075a
added better error handling. Also refactored some of the code and fixed a few issues in project_tree_saver
2016-05-10 17:15:20 +02:00
James Lopez
5b51d13c5e
removed method no longer needed
2016-05-10 12:01:10 +02:00
James Lopez
d607046df3
fix merge conflicts
2016-05-10 11:56:13 +02:00
James Lopez
6a12ff6345
renaming variable
2016-05-09 18:40:31 +02:00
James Lopez
f3a8821217
Merge remote-tracking branch 'gitlab/feature/project-export' into feature/project-export
2016-05-09 18:34:42 +02:00
James Lopez
21be0cae62
fixing merge issues
2016-05-09 18:33:48 +02:00
James Lopez
5dad9f1fcb
new line missing
2016-05-09 16:19:07 +00:00
James Lopez
47cd14b560
Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
2016-05-09 18:01:06 +02:00
James Lopez
7ff2a51eb2
more refactoring to import export reader
2016-05-09 17:58:43 +02:00
James Lopez
3f87387b6f
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export
...
# Conflicts:
# app/models/project.rb
2016-05-09 12:19:33 +02:00
James Lopez
9c639041fe
bit more refactoring of import export reader, fixed rubocop warning
2016-05-09 12:15:50 +02:00
James Lopez
3aee167dcc
fixed issues after refactor, spec passing
2016-05-09 11:10:12 +02:00
Stan Hu
4be77d0b05
Improve multiple branch push performance by memoizing permission checking
...
If you attempt to push thousands of branches at once, the 60-second timeout
will occur because GitAccess checking does a lot of work to check if the
user has permission to push to a branch. This changes does two things:
1. Instead of making 1 DB query per branch push, use a memoized list of protected branches to check
2. Memoize what permissions the user has to perform on this project
On a test of 10,000 branch pushes, this prevents gitlab-shell from hitting the 60-second
timeout.
Closes #17225
2016-05-09 01:17:14 -07:00
Stan Hu
21d89d0286
Update SVG sanitizer to conform to SVG 1.1
...
Use a custom Loofah scrubber since sanitize 2.x transformers are inadequate
to handle case-sensitive SVG attributes. sanitize parses documents as HTML
instead of XML, which causes all SVG attribute names (e.g. viewBox) to be downcased.
* SVG element list: https://www.w3.org/TR/SVG/eltindex.html
* SVG attribute list: https://www.w3.org/TR/SVG/attindex.html
Closes #14555
2016-05-06 23:20:24 -07:00
James Lopez
8ac53eb5d0
started refactoring import export reader - WIP
2016-05-06 17:55:06 +02:00
James Lopez
49cdb778a1
few fixes to import specs and code
2016-05-06 15:18:25 +02:00
James Lopez
4290e9c8dd
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
...
# Conflicts:
# lib/gitlab/import_export/import_export.yml
2016-05-06 14:45:15 +02:00
James Lopez
b6ab4a3113
missing private keyword
2016-05-06 14:39:57 +02:00
James Lopez
ce598b0541
fixed and refactored a few things based on MR feedback
2016-05-06 13:40:02 +02:00
Robert Speicher
4fce876542
Merge branch 'fix/import-url-issues' into 'master'
...
Fix importer bug when throwing exceptions
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15681
See merge request !3941
2016-05-05 22:27:40 +00:00
James Lopez
James Lopez
Stan Hu
Robert Speicher