Merge branch 'master' into sh-support-bitbucket-server-import

2 files changed, 11 insertions, 0 deletions

diff --git a/config/initializers/active_record_table_definition.rb b/config/initializers/active_record_table_definition.rb
index 8e3a1c7a62f..a71069f27a3 100644
--- a/config/initializers/active_record_table_definition.rb
+++ b/config/initializers/active_record_table_definition.rb
@@ -29,6 +29,11 @@ module ActiveRecord
       def datetime_with_timezone(column_name, **options)
         column(column_name, :datetime_with_timezone, options)
       end
+
+      # Disable timestamp alias to datetime
+      def aliased_types(name, fallback)
+        fallback
+      end
     end
   end
 end
diff --git a/config/routes/import.rb b/config/routes/import.rb
index be3058193d5..3998d977c81 100644
--- a/config/routes/import.rb
+++ b/config/routes/import.rb
@@ -52,4 +52,10 @@ namespace :import do
   resource :gitlab_project, only: [:create, :new] do
     post :create
   end
+
+  resource :manifest, only: [:create, :new], controller: :manifest do
+    get :status
+    get :jobs
+    post :upload
+  end
 end