9c76a6fa96
Show incompatible projects in Google Code import status
...
Importing a JSON file with only one Subversion project lead to confusion
over whether the system was working. Provide status why these projects
could not be imported directly.
Closes #1531
2015-04-30 06:56:49 -07:00
2505300b7b
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/import/google_code_controller.rb
2015-04-21 15:36:58 +03:00
355e6868a2
Fix redirect when trying to view invalid Google Code import status.
2015-04-21 10:30:07 +02:00
5a4ebfb47a
Fixed the Rails/ActionFilter cop
...
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-04-20 15:39:37 +02:00
dfebcb89e6
Don't save unchanged user map items to the DB.
2015-04-17 13:32:29 +02:00
dba63d667d
Allow user map to be specified.
2015-04-14 14:50:56 +02:00
17e2310878
Add instructions to Google Code import page.
2015-04-03 16:02:39 +02:00
7b5bc32cad
Allow projects to be imported from Google Code.
2015-04-03 15:29:27 +02:00
Stan Hu