Merge branch 'master' of bitbucket.org:signum/debshots

config/database.yml

@@ -7,8 +7,8 @@ development:
   adapter: postgresql
   database: debshots_dev
   username: debshots
-  password: GonwannEn0
-  host: localhost
+  password: shootme
+  host: torf
   pool: 5
   timeout: 5000
 
@@ -19,8 +19,8 @@ test:
   adapter: postgresql
   database: debshots_test
   username: debshots
-  password: GonwannEn0
-  host: localhost
+  password: shootme
+  host: torf
   pool: 5
   timeout: 5000
 

config/environments/development.rb

@@ -30,10 +30,6 @@ Debshots::Application.configure do
   # ActiveRecord errors propagate normally (forward deprecation to Rails 5)
   config.active_record.raise_in_transactional_callbacks = true
 
-
-  # URL prefix leading to the static images that should get delivered by the web server
-  config.images_path_prefix = '/screenshots'
-
   # DEB package repositories to parse when running "rake debshots:... tasks"
   config.package_sources = [
     {

config/routes.rb

@@ -13,13 +13,13 @@ Debshots::Application.routes.draw do
 
   get 'packages' => 'packages#grid', as: :packages_grid
   get 'packages/list' => 'packages#list', as: :packages_list
-  get 'package/:name' => 'packages#details', as: :package
+  get 'package/:name' => 'packages#details', as: :package, name: /[^\/]+/
   get 'upload', to: redirect('/packages')
   get 'upload/:name' => 'packages#upload', as: :upload_package_by_name
-  post 'upload_image/:name' => 'packages#upload_image', as: :upload_image
+  post 'upload_image/:name' => 'packages#upload_image', as: :upload_image, name: /[^\/]+/
   get 'delete_screenshot/:name/:id' => 'packages#delete_screenshot', as: :delete_screenshot
   get 'about' => 'welcome#about'
-  get 'thumbnail/:name' => 'packages#thumbnail', as: :thumbnail_image
+  get 'thumbnail/:name' => 'packages#thumbnail', as: :thumbnail_image, name: /[^\/]+/
 
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".