diff --git a/Gemfile b/Gemfile index 0e330b7..70ae6da 100644 --- a/Gemfile +++ b/Gemfile @@ -1,51 +1,20 @@ source 'https://rubygems.org' - - -# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' ruby '2.1.1' gem 'rails', '4.1.1' -# Use sqlite3 as the database for Active Record -# Use SCSS for stylesheets gem 'sass-rails', '~> 4.0.3' -# Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' -# Use CoffeeScript for .js.coffee assets and views gem 'coffee-rails', '~> 4.0.0' -# See https://github.com/sstephenson/execjs#readme for more supported runtimes -# gem 'therubyracer', platforms: :ruby - -# Use jquery as the JavaScript library gem 'jquery-rails' -# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks' -# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 2.0' -# bundle exec rake doc:rails generates the API under doc/api. gem 'sdoc', '~> 0.4.0', group: :doc - -# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring', group: :development - -# Use ActiveModel has_secure_password -# gem 'bcrypt', '~> 3.1.7' - -# Use unicorn as the app server -# gem 'unicorn' - -# Use Capistrano for deployment -# gem 'capistrano-rails', group: :development - -# Use debugger -# gem 'debugger', group: [:development, :test] - - gem 'bootstrap-sass' gem 'devise' gem 'haml-rails' gem 'mysql2' gem 'simple_form' gem 'therubyracer', :platform=>:ruby - group :development do gem 'better_errors' gem 'binding_of_caller', :platforms=>[:mri_21] @@ -54,25 +23,20 @@ group :development do gem 'guard-rspec' gem 'html2haml' gem 'quiet_assets' - gem 'rails_apps_pages' - gem 'rails_apps_testing' gem 'rails_layout' gem 'rb-fchange', :require=>false gem 'rb-fsevent', :require=>false gem 'rb-inotify', :require=>false end - group :development, :test do gem 'factory_girl_rails' gem 'pry-rails' gem 'pry-rescue' gem 'rspec-rails', '>= 3.0.0.beta2' end - group :production do gem 'thin' end - group :test do gem 'capybara' gem 'database_cleaner' @@ -80,4 +44,3 @@ group :test do gem 'launchy' gem 'selenium-webdriver' end - diff --git a/config/routes.rb b/config/routes.rb index 3f66539..1daf9a4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,56 +1,2 @@ Rails.application.routes.draw do - # The priority is based upon order of creation: first created -> highest priority. - # See how all your routes lay out with "rake routes". - - # You can have the root of your site routed with "root" - # root 'welcome#index' - - # Example of regular route: - # get 'products/:id' => 'catalog#view' - - # Example of named route that can be invoked with purchase_url(id: product.id) - # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase - - # Example resource route (maps HTTP verbs to controller actions automatically): - # resources :products - - # Example resource route with options: - # resources :products do - # member do - # get 'short' - # post 'toggle' - # end - # - # collection do - # get 'sold' - # end - # end - - # Example resource route with sub-resources: - # resources :products do - # resources :comments, :sales - # resource :seller - # end - - # Example resource route with more complex sub-resources: - # resources :products do - # resources :comments - # resources :sales do - # get 'recent', on: :collection - # end - # end - - # Example resource route with concerns: - # concern :toggleable do - # post 'toggle' - # end - # resources :posts, concerns: :toggleable - # resources :photos, concerns: :toggleable - - # Example resource route within a namespace: - # namespace :admin do - # # Directs /admin/products/* to Admin::ProductsController - # # (app/controllers/admin/products_controller.rb) - # resources :products - # end end -- libgit2 0.21.2