-
- Downloads
Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq...
Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout Signed-off-by:Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG db/schema.rb
Showing
- CHANGELOG 1 addition, 0 deletionsCHANGELOG
- app/controllers/projects_controller.rb 30 additions, 12 deletionsapp/controllers/projects_controller.rb
- app/models/project.rb 41 additions, 12 deletionsapp/models/project.rb
- app/observers/project_observer.rb 1 addition, 25 deletionsapp/observers/project_observer.rb
- app/services/projects/create_service.rb 23 additions, 0 deletionsapp/services/projects/create_service.rb
- app/views/projects/create.js.haml 6 additions, 2 deletionsapp/views/projects/create.js.haml
- app/views/projects/empty.html.haml 29 additions, 41 deletionsapp/views/projects/empty.html.haml
- app/views/projects/import.html.haml 30 additions, 0 deletionsapp/views/projects/import.html.haml
- app/views/projects/new.html.haml 5 additions, 2 deletionsapp/views/projects/new.html.haml
- app/workers/repository_import_worker.rb 2 additions, 2 deletionsapp/workers/repository_import_worker.rb
- config/routes.rb 2 additions, 0 deletionsconfig/routes.rb
- db/migrate/20140312145357_add_import_status_to_project.rb 5 additions, 0 deletionsdb/migrate/20140312145357_add_import_status_to_project.rb
- db/migrate/20140313092127_migrate_already_imported_projects.rb 12 additions, 0 deletions...grate/20140313092127_migrate_already_imported_projects.rb
- db/schema.rb 2 additions, 2 deletionsdb/schema.rb
Loading
Please register or sign in to comment