kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/controllers
History
Douwe Maan f2cf6d75ec Merge branch 'show-invalid-projects-google-code-import' into 'master' 
Show incompatible projects in Google Code import status

Using Google Code import with a JSON file that contained only one Subversion project led to confusion
over whether the system was working. Display the list of valid projects if there are any, and show a list of incompatible projects. Provide tips on how to retain issue data after conversion.

Closes #1531

## Screenshots

Before:

![Screen_Shot_2015-04-29_at_12.46.41_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/16ea5a99cbace48cd2f2c238b5f73f4e/Screen_Shot_2015-04-29_at_12.46.41_AM.png)

After with no projects available (notice the button is hidden):

![Screen_Shot_2015-04-30_at_1.34.38_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/43c612cdcbab181713e5764e2f38a04e/Screen_Shot_2015-04-30_at_1.34.38_AM.png)

After with 1 valid and 1 incompatible project:

![Screen_Shot_2015-04-30_at_1.37.26_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b5bcbd304206a996932e5208ef54a071/Screen_Shot_2015-04-30_at_1.37.26_AM.png)

See merge request !586
 		2015-04-30 17:08:45 +00:00
..
admin Revert "Added X-GitLab-Event header for web hooks" 2015-04-27 16:29:31 +03:00
dashboard Fixed the Rails/ActionFilter cop 2015-04-20 15:39:37 +02:00
explore Fixed the Rails/ActionFilter cop 2015-04-20 15:39:37 +02:00
groups Fixed the Rails/ActionFilter cop 2015-04-20 15:39:37 +02:00
import Show incompatible projects in Google Code import status 2015-04-30 06:56:49 -07:00
oauth Fixed the Rails/ActionFilter cop 2015-04-20 15:39:37 +02:00
profiles Fixed the Rails/ActionFilter cop 2015-04-20 15:39:37 +02:00
projects Don't allow a merge request to be merged when its title starts with "WIP". 2015-04-30 15:46:36 +02:00
application_controller.rb Remove duplicate settings for default_url_options 2015-04-25 19:46:04 -04:00
autocomplete_controller.rb Add autocomplete controller 2015-03-26 19:06:19 -07:00
confirmations_controller.rb Add invites controller. 2015-04-14 12:07:33 +02:00
dashboard_controller.rb Fixed the Rails/ActionFilter cop 2015-04-20 15:39:37 +02:00
groups_controller.rb Fixed the Rails/ActionFilter cop 2015-04-20 15:39:37 +02:00
help_controller.rb Loosen help page parameter constraints for category 2015-04-15 13:15:18 -04:00
invites_controller.rb Fixed the Rails/ActionFilter cop 2015-04-20 15:39:37 +02:00
namespaces_controller.rb Fixed the Rails/ActionFilter cop 2015-04-20 15:39:37 +02:00
omniauth_callbacks_controller.rb When add new social account - redirect to accounts page and show notice message 2015-02-08 00:53:31 -08:00
passwords_controller.rb Use ruby 1.9 hash syntax 2015-01-23 17:41:10 -08:00
profiles_controller.rb Fixed the Rails/ActionFilter cop 2015-04-20 15:39:37 +02:00
projects_controller.rb Add atom feed for project activity. 2015-04-23 17:11:39 +02:00
registrations_controller.rb Fixed the Rails/ActionFilter cop 2015-04-20 15:39:37 +02:00
search_controller.rb Draft improvements to search layout 2015-04-28 12:48:42 +03:00
sessions_controller.rb Upon successful login, clear `reset_password_token` field 2015-04-08 16:06:56 -04:00
snippets_controller.rb Merge branch 'master' into new-sidebar 2015-04-23 12:08:03 +03:00
uploads_controller.rb Fixed the Rails/ActionFilter cop 2015-04-20 15:39:37 +02:00
users_controller.rb Fixed the Rails/ActionFilter cop 2015-04-20 15:39:37 +02:00