Skip to content

Commit

Permalink
revert changes to 3 files
Browse files Browse the repository at this point in the history
Please enter the commit message for your changes. Lines starting
  • Loading branch information
Paula Haertel committed Jun 20, 2014
1 parent 4eb08f2 commit 052673d
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 47 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ 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


group :development, :test do
gem 'rspec-rails', '~> 3.0.0'
gem 'capybara'
Expand Down
7 changes: 0 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ GEM
multi_json (1.10.1)
nokogiri (1.6.2.1)
mini_portile (= 0.6.0)
nokogiri (1.6.2.1-x86-mingw32)
mini_portile (= 0.6.0)
polyglot (0.3.5)
rack (1.5.2)
rack-test (0.6.2)
Expand Down Expand Up @@ -132,7 +130,6 @@ GEM
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.9)
sqlite3 (1.3.9-x86-mingw32)
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
Expand All @@ -143,8 +140,6 @@ GEM
coffee-rails
tzinfo (1.2.1)
thread_safe (~> 0.1)
tzinfo-data (1.2014.5)
tzinfo (>= 1.0.0)
uglifier (2.5.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
Expand All @@ -153,7 +148,6 @@ GEM

PLATFORMS
ruby
x86-mingw32

DEPENDENCIES
capybara
Expand All @@ -170,5 +164,4 @@ DEPENDENCIES
spring
sqlite3
turbolinks
tzinfo-data
uglifier (>= 1.3.0)
80 changes: 40 additions & 40 deletions db/schema.rb
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
# encoding: UTF-8
# This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.
#
# Note that this schema.rb definition is the authoritative source for your
# database schema. If you need to create the application database on another
# system, you should be using db:schema:load, not running all the migrations
# from scratch. The latter is a flawed and unsustainable approach (the more migrations
# you'll amass, the slower it'll run and the greater likelihood for issues).
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 20140616081634) do

create_table "customers", force: true do |t|
t.string "name"
t.decimal "discount"
t.datetime "created_at"
t.datetime "updated_at"
end

create_table "orders", force: true do |t|
t.integer "customer_id"
t.date "placed_on"
t.string "status"
t.datetime "created_at"
t.datetime "updated_at"
end

create_table "pumpkins", force: true do |t|
t.string "name"
t.string "color"
t.integer "size"
t.decimal "price"
t.datetime "created_at"
t.datetime "updated_at"
end

end
# encoding: UTF-8
# This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.
#
# Note that this schema.rb definition is the authoritative source for your
# database schema. If you need to create the application database on another
# system, you should be using db:schema:load, not running all the migrations
# from scratch. The latter is a flawed and unsustainable approach (the more migrations
# you'll amass, the slower it'll run and the greater likelihood for issues).
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 20140616081634) do

create_table "customers", force: true do |t|
t.string "name"
t.decimal "discount"
t.datetime "created_at"
t.datetime "updated_at"
end

create_table "orders", force: true do |t|
t.integer "customer_id"
t.date "placed_on"
t.string "status"
t.datetime "created_at"
t.datetime "updated_at"
end

create_table "pumpkins", force: true do |t|
t.string "name"
t.string "color"
t.integer "size"
t.decimal "price"
t.datetime "created_at"
t.datetime "updated_at"
end

end

0 comments on commit 052673d

Please sign in to comment.