James Lopez
c5bc262981
few fixes - import from UI working
2016-04-28 18:00:30 +02:00
James Lopez
4037a73894
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
2016-04-25 18:06:24 +02:00
James Lopez
22ff009a54
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
2016-04-25 18:01:58 +02:00
James Lopez
10f1609535
changes to be picked by the UI branch
2016-04-25 18:00:15 +02:00
Stan Hu
6dff1a9a2b
Fix Error 500 due to stale cache when projects are renamed or transferred
...
Closes gitlab-org/gitlab-ee#506
2016-04-25 06:57:50 -07:00
James Lopez
a0ede57dd6
Merge branches 'feature/project-export' and 'feature/project-import' into feature/project-export-ui-experimental
2016-04-22 15:29:35 +02:00
James Lopez
8f973b8f68
more refactoring - easier guessing path changes
2016-04-22 12:45:20 +02:00
James Lopez
2d503f6410
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export
2016-04-21 17:37:33 +02:00
James Lopez
7614d230a2
fix conflicts
2016-04-21 17:28:56 +02:00
Alfredo Sumaran and Jacob Schatz
a96dc94428
Memoize target
2016-04-16 07:21:28 -04:00
Alfredo Sumaran and Jacob Schatz
1eeabdc6a5
Change variable name
2016-04-16 07:21:28 -04:00
Alfredo Sumaran and Jacob Schatz
05628e0c2f
Fixes failing spec
2016-04-16 07:21:28 -04:00
Alfredo Sumaran and Jacob Schatz
ad48ecacae
Update method name and remove unneeded params
2016-04-16 07:21:28 -04:00
Alfredo Sumaran and Jacob Schatz
562c9652d6
Put owner and participating people first
2016-04-16 07:21:28 -04:00
James Lopez
ae777ea061
WIP - importing file and repo
2016-04-15 18:14:28 +02:00
James Lopez
41163fd552
some experimental UI stuff to test export
2016-04-14 18:01:21 +02:00
Rémy Coutable
4a514b27e9
Merge branch 'issue_15155' into 'master'
...
Setup visibility level for project when transfering for a group
fixes #15155
See merge request !3707
2016-04-14 15:13:08 +00:00
James Lopez
97c3aff16f
refactored import stuff, moved to lib
2016-04-14 17:10:57 +02:00
James Lopez
adbcccb4dd
Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
2016-04-14 16:58:52 +02:00
James Lopez
0852f539aa
refactored stuff, added a save and compress all class and moved mostly everything to lib
2016-04-14 16:57:25 +02:00
Felipe Artur
a8ea2c1895
Change transfer service to use existing methods
2016-04-14 11:34:42 -03:00
Felipe Artur
11f46b459e
Setup visibility level for project when transfering for a group
2016-04-13 15:28:10 -03:00
James Lopez
267fd01ce8
fixed import and spec is now passing!
2016-04-13 17:47:14 +02:00
Yorick Peterse
3b9edce803
Instrument the HousekeepingService class
...
This allows us to track how much time is spent in updating the
"pushes_since_gc" column as well as the time needed to obtain the lease.
2016-04-13 15:31:13 +02:00
James Lopez
36ba23d131
Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
2016-04-12 18:22:01 +02:00
James Lopez
6f74c7d482
fix export commits stuff
2016-04-12 18:06:57 +02:00
James Lopez
0d8a97dcef
some more fixes to import projects
2016-04-12 17:10:30 +02:00
James Lopez
c94c0dc0c7
Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
2016-04-12 15:34:36 +02:00
James Lopez
3b99e4ae5b
add issue and MR comments to default export. Fix spec
2016-04-12 15:32:25 +02:00
James Lopez
495397793e
fix spec
2016-04-12 12:57:00 +02:00
James Lopez
eb55cb927b
more refactoring
2016-04-12 12:24:40 +02:00
James Lopez
4ffcd42780
import working!
2016-04-12 11:42:37 +02:00
James Lopez
dbf755ae56
small fix
2016-04-12 11:34:58 +02:00
James Lopez
da60baf2a5
fixing more importing issues
2016-04-12 10:36:18 +02:00
James Lopez
56fc58930c
more refactoring to use dynamic import
2016-04-11 18:30:54 +02:00
James Lopez
a28be02e88
starting to use the new dynamic stuff on the import
2016-04-08 18:13:19 +02:00
James Lopez
d29c816dfe
Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
2016-04-08 16:04:59 +02:00
James Lopez
5d642fb7aa
fix rubocop warnings
2016-04-08 15:07:12 +02:00
James Lopez
de6c44e983
using new config
2016-04-07 18:14:42 +02:00
James Lopez
acfa0b69d5
continuing to refactor config, added spec and fixed a few problems
2016-04-07 13:19:57 +02:00
James Lopez
b4fe002264
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export
2016-04-06 18:16:20 +02:00
James Lopez
efde96e9cd
started refactored the dynamic rules to be defined in a yml file
2016-04-06 18:12:41 +02:00
Douglas Barbosa Alexandre
f2005fa566
Flush repository cache before import project data
...
GitHub Pull Requests importer handle with the repository while
importing data, we need to make sure that the cached values are valid.
2016-04-04 19:35:39 -03:00
Douwe Maan
f505c753b0
Merge branch 'fix_remove_fork_link' into 'master'
...
Remove fork link closes all merge requests opened on source project
Currently, if you:
- create a fork
- open a merge request on the source project
- remove the fork link
The created MR cannot be closed.
With this MR, all pending MR is closed when the fork link is removed.
See merge request !3189
2016-04-04 15:37:08 +00:00
Baldinof
a6b5b50e14
Fix incorrect variable name
2016-04-04 14:41:01 +00:00
Baldinof
fa4126acff
Move unlink fork logic to a service
2016-03-22 15:34:35 +01:00
James Lopez
b0f34fb091
Merge branches 'feature/project-import' and 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
2016-03-21 09:14:24 +01:00
Douwe Maan
8db1292139
Tweaks, refactoring, and specs
2016-03-20 21:04:07 +01:00
Douwe Maan
2eb19ea3ea
Merge branch 'master' into issue_12658
2016-03-20 14:57:25 +01:00
Felipe Artur
8b830b8c3b
Fix specs
2016-03-18 21:04:53 -03:00
James Lopez
Stan Hu
Alfredo SumaranandJacob Schatz
Rémy Coutable
Felipe Artur
Yorick Peterse
Douglas Barbosa Alexandre
Douwe Maan
Baldinof
Douwe Maan