Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Heather, Danielle, Yasmin, and Mary's Zoolily #32

Open
wants to merge 367 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
367 commits
Select commit Hold shift + click to select a range
00ffe10
Added review model validations, review model tests and review model f…
yasminor Oct 24, 2016
0e938b0
Attempt to test OAuth in merchant model
dschrimm Oct 24, 2016
6ef56cc
Merge branch 'master' of https://github.com/heatherherrington/betsy
dschrimm Oct 24, 2016
f6e9df6
Added description column to the the reviews table
yasminor Oct 24, 2016
578590a
Added methods to the reviews controller
yasminor Oct 24, 2016
19a9dfa
Added limited tests for the review controller and added to the fixtures
yasminor Oct 24, 2016
12dfa62
Merge branch 'b/yo/review_controller'
yasminor Oct 24, 2016
a5bfd81
Merchant model test for full coverage
dschrimm Oct 24, 2016
a2ed942
Merge branch 'master' of https://github.com/heatherherrington/betsy
dschrimm Oct 24, 2016
9e26229
migration for adding product 'url' column and uncommented field in pr…
morrime Oct 24, 2016
ef02a26
Changed category to category_id in products table
heatherherrington Oct 24, 2016
a811075
dropped unnecessary categories_tables
yasminor Oct 24, 2016
e97cb2c
Merge branch 'master' of https://github.com/heatherherrington/betsy
morrime Oct 24, 2016
a89fd44
Fixed merge conflict in schema
yasminor Oct 24, 2016
2c71335
linked to new product form from merchant show (dashboard)
morrime Oct 24, 2016
f2c824d
Merge branch 'master' of https://github.com/heatherherrington/betsy
morrime Oct 24, 2016
61dc5b4
Add photo url and updated show page with url logic
dschrimm Oct 24, 2016
e666090
made product link to show page from dashboard
morrime Oct 24, 2016
4ca3349
please work
dschrimm Oct 24, 2016
9be7a8a
Merge branch 'master' of https://github.com/heatherherrington/betsy
dschrimm Oct 24, 2016
adf86e7
Remove photo_url text field from form
dschrimm Oct 24, 2016
46caab9
Can view products by merchant and category
heatherherrington Oct 24, 2016
7c8e6d9
Merge conflict in schema.rb fixed
heatherherrington Oct 24, 2016
942be33
Move show photo logic to products model
dschrimm Oct 24, 2016
dd79ecb
Update logic in guests index page
dschrimm Oct 24, 2016
4740f2c
remove url column
dschrimm Oct 24, 2016
98cc46f
fix merge conflict
dschrimm Oct 24, 2016
755d75a
Deleted drop categories tables to rake db migrate
heatherherrington Oct 24, 2016
f6bd487
fixed population of merchant id field so it isn't nil anymore
morrime Oct 24, 2016
5e47595
resolved merge conflict
morrime Oct 24, 2016
f931a20
Add migration
dschrimm Oct 24, 2016
0b5c023
Merge branch 'master' of https://github.com/heatherherrington/betsy
dschrimm Oct 24, 2016
7faa82b
Add photo logic for products index view
dschrimm Oct 24, 2016
42f31a9
change photo validation
dschrimm Oct 24, 2016
14ccb9c
Added value to photo_url in seed
heatherherrington Oct 24, 2016
1d04cb8
Adding controller testing
heatherherrington Oct 24, 2016
3b80dc8
Added testing or orders controller
heatherherrington Oct 24, 2016
024c35c
Edited search functionality
heatherherrington Oct 24, 2016
cf27538
Images no longer repeat on main page
heatherherrington Oct 24, 2016
fc88a67
added tests for sessions controller, modified routes and sessions con…
morrime Oct 24, 2016
7134c2b
Merge branch 'hay'
morrime Oct 24, 2016
38e4a40
add to cart experiments
dschrimm Oct 24, 2016
42956d9
Merge branch 'master' of https://github.com/heatherherrington/betsy
dschrimm Oct 24, 2016
b2c72b7
Trying to style main page
heatherherrington Oct 24, 2016
8fad307
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington Oct 24, 2016
0378468
Merge branch 'main-page-styling'
heatherherrington Oct 24, 2016
22b013b
Fixed errors with products testing
heatherherrington Oct 24, 2016
c8c6c16
Updating orders show stub
heatherherrington Oct 25, 2016
32d6ba2
Added inventory vs demand validator
heatherherrington Oct 25, 2016
e20f6a6
Maybe making a cart
heatherherrington Oct 25, 2016
101d2b9
Expiration date working in orders
heatherherrington Oct 25, 2016
5e5fe7a
Add active category to products
dschrimm Oct 25, 2016
7be5d73
Add active category to products
dschrimm Oct 25, 2016
299b762
Correct orderitems_controller
dschrimm Oct 25, 2016
4b5329a
updated testing for orders controller, coverage is 100%, but will nee…
morrime Oct 25, 2016
ff95f79
copied updated OrderItems controller
yasminor Oct 25, 2016
1840087
Fixed merge conflict
yasminor Oct 25, 2016
7f57c3a
Product index page and show page only render active products
dschrimm Oct 25, 2016
f370ab2
Ability to make a product not active
dschrimm Oct 25, 2016
a092ecc
Merge branch 'master' of https://github.com/heatherherrington/betsy
dschrimm Oct 25, 2016
7587950
Got Foundation working
heatherherrington Oct 25, 2016
a678a2e
Merge branch 'foundation'
heatherherrington Oct 25, 2016
822ff7b
Add active logic to category show page
dschrimm Oct 25, 2016
d4f9340
small adjustment to add to cart and comment out for now
dschrimm Oct 25, 2016
b41fb10
Formatting for product by category show page
heatherherrington Oct 25, 2016
a53da6b
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington Oct 25, 2016
9a4c655
reset database
yasminor Oct 25, 2016
1bf38af
Merge branch 'b/yo/practice'
yasminor Oct 25, 2016
5a7974d
changed redirect_to for sessions controller create, fixed merchants a…
morrime Oct 25, 2016
3c49b57
fixed sessions controller tests after changed sessiions controller ac…
morrime Oct 25, 2016
d57abae
Reinstate product method and button
dschrimm Oct 25, 2016
e1eea7f
Formatting pages as per wireframes
heatherherrington Oct 25, 2016
b94d957
Logic in show page to only show retire/reinstate links if merchant is…
dschrimm Oct 25, 2016
4664ad5
redirected the create action in sessions to the root path, may change…
yasminor Oct 25, 2016
9e46273
Merge branch 'master' of https://github.com/heatherherrington/betsy
yasminor Oct 25, 2016
8b10a97
resolved merge conflicts
morrime Oct 25, 2016
1e66774
Merge branch 'master' of https://github.com/heatherherrington/betsy
morrime Oct 25, 2016
3cd195c
fixed controller test
morrime Oct 25, 2016
219bbd6
Show retired products on index page only to merchant who owns those p…
dschrimm Oct 25, 2016
86f4ad0
Shows show page of retired product to merchant who owns it
dschrimm Oct 25, 2016
950b5ba
Show page says if product is retired to merchant
dschrimm Oct 25, 2016
d9002a9
fixed orders controller tests
morrime Oct 25, 2016
9f70a5c
deleted unnecessary test
morrime Oct 25, 2016
0ee44e3
Only current user can add new products to their merchant from link on…
dschrimm Oct 25, 2016
ab31a1a
Styling to header
heatherherrington Oct 25, 2016
22f11a0
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington Oct 25, 2016
af0eef5
On merchant show page show current user their inactive products
dschrimm Oct 25, 2016
37d9b70
Text change to index and show page
dschrimm Oct 25, 2016
43317e0
Conflict appears to be resolved
dschrimm Oct 25, 2016
a562f28
changed the orders table order_status column to a string datatype
yasminor Oct 25, 2016
e024759
generated a carts controller and accompanying files
yasminor Oct 25, 2016
35f0bf5
Added a helper method for current order
yasminor Oct 25, 2016
03a9db9
Added some things to the order items, orders and products controllers…
yasminor Oct 25, 2016
bb139fe
tried to write tests for categories_controller, but I'm confused. So,…
morrime Oct 25, 2016
fc4da8e
Merge branch 'categories_controller_test'
morrime Oct 25, 2016
6da9abf
Fix product paths on category show page
dschrimm Oct 25, 2016
628c725
Merge branch 'master' of https://github.com/heatherherrington/betsy
dschrimm Oct 25, 2016
0f170e4
changed method syntax in merchants controller, fixed test for that ac…
morrime Oct 25, 2016
903b357
Merge branch 'merchants_controller'
morrime Oct 25, 2016
79283ac
Combine merges of product show page
dschrimm Oct 25, 2016
b954b64
Merge branch 'master' of https://github.com/heatherherrington/betsy
dschrimm Oct 25, 2016
e9c201c
Formatted images and main page
heatherherrington Oct 25, 2016
bac1752
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington Oct 25, 2016
82951f9
Layout changes
heatherherrington Oct 26, 2016
c8a963e
Merge conflicts resolved
heatherherrington Oct 26, 2016
24352ea
resolve new review error
dschrimm Oct 26, 2016
4c8b0ad
Start of review form
dschrimm Oct 26, 2016
9772592
merchant show page logic
dschrimm Oct 26, 2016
50543d7
products index page logic
dschrimm Oct 26, 2016
45c545e
merchant show page logic update if statement
dschrimm Oct 26, 2016
12bdacc
fix merge conflict
dschrimm Oct 26, 2016
2557587
comment out double image assignment to reflect correct one only
dschrimm Oct 26, 2016
7c9aa61
Our favicon is a pig in boots
heatherherrington Oct 26, 2016
99af4d7
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington Oct 26, 2016
3b21e4f
resolved non-integer rating test
dschrimm Oct 26, 2016
c56b43a
Merge branch 'master' of https://github.com/heatherherrington/betsy
dschrimm Oct 26, 2016
fba2062
working on testing, added to yaml file
morrime Oct 26, 2016
3ef52e4
Merge branch 'products_controller'
morrime Oct 26, 2016
0433934
Formatted money description and tried to center images
heatherherrington Oct 26, 2016
732c872
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington Oct 26, 2016
bb8643f
Nested review routes and working new form
dschrimm Oct 26, 2016
d228e4b
Product reviews displaying on product show page
dschrimm Oct 26, 2016
021e443
Changed the OrderItems controller name to reflect naming conventions …
yasminor Oct 26, 2016
cd208f3
Add emoji for ranking
dschrimm Oct 26, 2016
ad03f24
Remove review link for current merchant's products
dschrimm Oct 26, 2016
8c37503
WIP Categories controller testing
heatherherrington Oct 26, 2016
02e57bd
a merchant cannot leave a review for their own product. need to get e…
dschrimm Oct 26, 2016
f5ff7e2
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington Oct 26, 2016
706de24
fixed tests for order model, added to yaml file, working on product c…
morrime Oct 26, 2016
b33dbb1
Merge branch 'order_test'
morrime Oct 26, 2016
80aaa50
WIP categories controller 'new' test
heatherherrington Oct 26, 2016
6a93793
Merge branch 'ds/review_self'
dschrimm Oct 26, 2016
719a0c5
Added test and route for new category
heatherherrington Oct 26, 2016
c82bb4a
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington Oct 26, 2016
4e20bf8
Minor formatting of main page
heatherherrington Oct 26, 2016
b01126e
Add text to merchant's show page review area
dschrimm Oct 26, 2016
0ce4041
test for create new review
morrime Oct 26, 2016
c751159
Merge branch 'master' of https://github.com/heatherherrington/betsy
dschrimm Oct 26, 2016
f1b5e4d
Working average on products show page
dschrimm Oct 27, 2016
d4c6d0c
rounded average to two decimals
dschrimm Oct 27, 2016
5a75379
Edit button and capabilities for merchant's products
dschrimm Oct 27, 2016
234715f
allow for float prices
dschrimm Oct 27, 2016
bcea9ab
Modified search result display
heatherherrington Oct 27, 2016
6fde22e
Edited to add merchant dashboard and merchant product show page
heatherherrington Oct 27, 2016
03622ac
Added content to order show page
heatherherrington Oct 27, 2016
c4b9bcd
Fixed error causing orders not being saved properly and order items n…
yasminor Oct 27, 2016
4480acb
Added a before_create model filter to set order status to pending eve…
yasminor Oct 27, 2016
050a740
Cart views
yasminor Oct 27, 2016
0e7aaa1
put in controller actions for require login, added route, created vie…
morrime Oct 27, 2016
db1a263
Merge branch 'controller_actions'
morrime Oct 27, 2016
a2f5103
Fixed merge conflicts in app, orders and products controllers as well…
yasminor Oct 27, 2016
5681720
Barebones dashboard show page
heatherherrington Oct 27, 2016
48eb401
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington Oct 27, 2016
d00a56a
migrated schema changes
yasminor Oct 27, 2016
3b049f0
Fix join table association and add csv of product categories
dschrimm Oct 27, 2016
f99788c
Dropdown for order status
heatherherrington Oct 27, 2016
a7a4b9e
Use join table in category show pages
dschrimm Oct 27, 2016
c146aa6
moved require_login to merchants controller
morrime Oct 27, 2016
a4978e3
Minor changes to Categories controller test
heatherherrington Oct 27, 2016
282cdb1
Merge branch 'master' of https://github.com/heatherherrington/betsy
yasminor Oct 27, 2016
6fa0ee2
merge conflict
morrime Oct 27, 2016
eb533e4
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington Oct 27, 2016
f5461f8
Merge branch 'master' of https://github.com/heatherherrington/betsy
yasminor Oct 27, 2016
68bbef2
Fixed conditional validations for order on order_status and got the c…
yasminor Oct 27, 2016
b78e24b
fixed testing errors for merchant controller by adding exceptions to …
morrime Oct 27, 2016
479ef81
Merge branch 'master' of https://github.com/heatherherrington/betsy
morrime Oct 27, 2016
6d996b0
WIP review controller testing
heatherherrington Oct 27, 2016
bf1b9a9
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington Oct 27, 2016
6665000
WIP: adding cart functionality to get to order confirmation page
yasminor Oct 27, 2016
4c62f8d
Tested reviews controller
heatherherrington Oct 27, 2016
53b8eb0
Merge branch 'testing'
heatherherrington Oct 27, 2016
31de33e
Working assign product multiple categories omg
dschrimm Oct 27, 2016
a697fb6
remove category_id from product table
dschrimm Oct 27, 2016
165e0cd
resolved resulting merge conflict from removing category_id column fr…
dschrimm Oct 27, 2016
fabb281
tried fixing merchant controller issues, failed.
morrime Oct 27, 2016
d8bc12c
Merge branch 'merch_control_test'
morrime Oct 27, 2016
7b3fdd5
Order items model testing
heatherherrington Oct 27, 2016
cd4f2f9
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington Oct 27, 2016
713aa08
Ran migration and schema changed
heatherherrington Oct 27, 2016
4f946ba
Fixed review functionality and layout on product page
heatherherrington Oct 27, 2016
a810ce8
added button to merchant products so they can edit them
morrime Oct 27, 2016
9edd30f
Merge branch 'merch_products'
morrime Oct 27, 2016
b58ca88
edit existing product's categories
dschrimm Oct 27, 2016
fdef6f1
Merge branch 'b/ds/edit_prod_categories'
dschrimm Oct 27, 2016
cfec2ca
Edited merchants show page button
heatherherrington Oct 27, 2016
77f026c
Categories show on edit
dschrimm Oct 27, 2016
b6cfe82
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington Oct 27, 2016
a212937
fix merge conflict
dschrimm Oct 27, 2016
95ab465
Modified the orders model validations so that you can change order st…
yasminor Oct 27, 2016
b4c48d2
Merge branch 'b/yo/cart_phase_II'
yasminor Oct 27, 2016
08d57ff
allow for no category do be selected during product creation
dschrimm Oct 27, 2016
92b1e87
add helper method for find categories and add to product update
dschrimm Oct 27, 2016
7a48401
fixed issue with price changing upon edit
dschrimm Oct 27, 2016
8acecc3
Merge branch 'b/ds/no_category_selected'
dschrimm Oct 27, 2016
e8753e6
Fixed product creation by unlogged in user
heatherherrington Oct 27, 2016
1b097b6
Make photos closer to same size
dschrimm Oct 28, 2016
57860d8
Merge branch 'b/ds/css_images'
dschrimm Oct 28, 2016
3c418bf
Edited Gemfile for Heroku deploy
heatherherrington Oct 28, 2016
c9e636b
Changed production.rb for Heroku deploy
heatherherrington Oct 28, 2016
36435e8
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington Oct 28, 2016
3db6f24
Changed for Heroku deploy
heatherherrington Oct 28, 2016
9659e9c
Fixed the cart AGAIN
yasminor Oct 28, 2016
293bf24
Merge branch 'master' of https://github.com/heatherherrington/betsy
yasminor Oct 28, 2016
b67b0cb
testing for products controller
morrime Oct 28, 2016
a3722d5
Merge branch 'products_controller_test'
morrime Oct 28, 2016
72ff9d8
Changed production.rb per heroku instructions
heatherherrington Oct 28, 2016
555b3a9
change gemfile.lock
yasminor Oct 28, 2016
805d0b0
Merge branch 'b/yo/cart_phase_III'
yasminor Oct 28, 2016
0123483
Eff the order validations
yasminor Oct 28, 2016
2ade990
price and total calculations
dschrimm Oct 28, 2016
0fcd55a
add spacing
dschrimm Oct 28, 2016
f4cde08
Add one of the item if no number is selected
dschrimm Oct 28, 2016
c837200
default quantity value 1
dschrimm Oct 28, 2016
3a97b00
allow for nil quantity
dschrimm Oct 28, 2016
82007be
total cart price
dschrimm Oct 28, 2016
9a23c82
Generated Gemfile.lock
heatherherrington Oct 28, 2016
0c7dd9c
Order items saved in cart
dschrimm Oct 28, 2016
3a799a2
Add render if order_item not created
dschrimm Oct 28, 2016
f76c459
Added functionality for merchant to add new category WIP
heatherherrington Oct 28, 2016
4e34233
Cannot add new category unless logged in
heatherherrington Oct 28, 2016
71f1cd3
Minor CSS changes
heatherherrington Oct 28, 2016
552fe54
A second item created of same product adds to initial line item inste…
dschrimm Oct 28, 2016
1b562f8
Merge branch 'b/ds/cart_orders'
dschrimm Oct 28, 2016
fd74067
puts two decimal points after price
dschrimm Oct 28, 2016
94c612c
CSS and drop-down for review form
heatherherrington Oct 28, 2016
d041e9b
Merge branch 'CSS'
heatherherrington Oct 28, 2016
398993c
WIP categories controller testing
heatherherrington Oct 28, 2016
b20ab10
redirecting to back if order qty is greater than available qty, also …
morrime Oct 28, 2016
9e50bff
WIP controller testing and product edit
heatherherrington Oct 28, 2016
d192a47
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington Oct 28, 2016
12235d9
slight additions to orderitem tests
dschrimm Oct 28, 2016
41343d7
Merge branch 'b/ds/testing_trial'
dschrimm Oct 28, 2016
4ba9cd6
WIP Sessions Controller testing
heatherherrington Oct 28, 2016
4ce6e89
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington Oct 28, 2016
59c4ff6
WIP sessions controller testing
heatherherrington Oct 28, 2016
e2f53d5
Failing sessions controller tests and do not know why
heatherherrington Oct 28, 2016
e4e3bdd
The cart works now with validations
yasminor Oct 28, 2016
f04a12c
merge conflict fixed
yasminor Oct 28, 2016
de7197a
Resolved merge conflict in order items controller
heatherherrington Oct 28, 2016
4f4b983
Fixed error functionality
heatherherrington Oct 28, 2016
76553a4
forgot a fix another merge conflict, now fixed
yasminor Oct 28, 2016
ecbdfb4
Merge branch 'master' of https://github.com/heatherherrington/betsy
yasminor Oct 28, 2016
c28230f
photo text and edit button
dschrimm Oct 28, 2016
d3f032f
Centered images on merchant page
dschrimm Oct 28, 2016
c9f3115
Centered images on categories and products index page
dschrimm Oct 28, 2016
c91bb9b
close div tags
dschrimm Oct 28, 2016
7497b0e
Merge branch 'b/ds/photo_placement'
dschrimm Oct 28, 2016
fd0da1d
fixed edit button on product show page
dschrimm Oct 28, 2016
d6590d7
Order items controller testing
heatherherrington Oct 30, 2016
f8dc613
Maybe fixed case-sensitive search functionality for heroku
heatherherrington Oct 30, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,14 @@
# Ignore bundler config.
/.bundle

# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal

# Ignore all logfiles and tempfiles.
/log/*
!/log/.keep
/tmp

.DS_Store
.env
coverage
29 changes: 25 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
source 'https://rubygems.org'
ruby '2.3.1'


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.6'
# Use postgresql as the database for Active Record
# gem 'pg', '~> 0.15'
gem 'rails', '4.2.7'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
Expand All @@ -14,6 +12,11 @@ gem 'coffee-rails', '~> 4.1.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Foundation Rails Gem
gem 'foundation-rails'
# Required due to an incompatibility between TurboLinks and Foundation.
gem 'jquery-turbolinks'

# 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
Expand All @@ -23,6 +26,10 @@ gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc

gem "omniauth"
gem "omniauth-github"


# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

Expand All @@ -31,10 +38,22 @@ gem 'sdoc', '~> 0.4.0', group: :doc

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development
gem 'simplecov', :require => false, :group => :test

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'
gem 'dotenv-rails'
gem 'better_errors'
gem 'binding_of_caller'
gem 'pry'
gem 'sqlite3'

end

group :production do
gem 'pg'
gem 'rails_12factor'
end

group :development do
Expand All @@ -43,4 +62,6 @@ group :development do

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'

gem "rails-erd"
end
199 changes: 141 additions & 58 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,136 +1,209 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.6)
actionpack (= 4.2.6)
actionview (= 4.2.6)
activejob (= 4.2.6)
actionmailer (4.2.7)
actionpack (= 4.2.7)
actionview (= 4.2.7)
activejob (= 4.2.7)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.6)
actionview (= 4.2.6)
activesupport (= 4.2.6)
actionpack (4.2.7)
actionview (= 4.2.7)
activesupport (= 4.2.7)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.6)
activesupport (= 4.2.6)
actionview (4.2.7)
activesupport (= 4.2.7)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.6)
activesupport (= 4.2.6)
activejob (4.2.7)
activesupport (= 4.2.7)
globalid (>= 0.3.0)
activemodel (4.2.6)
activesupport (= 4.2.6)
activemodel (4.2.7)
activesupport (= 4.2.7)
builder (~> 3.1)
activerecord (4.2.6)
activemodel (= 4.2.6)
activesupport (= 4.2.6)
activerecord (4.2.7)
activemodel (= 4.2.7)
activesupport (= 4.2.7)
arel (~> 6.0)
activesupport (4.2.6)
activesupport (4.2.7)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.3)
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
byebug (8.2.5)
byebug (9.0.6)
choice (0.2.0)
coderay (1.1.1)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.1)
concurrent-ruby (1.0.2)
debug_inspector (0.0.2)
docile (1.1.5)
dotenv (2.1.1)
dotenv-rails (2.1.1)
dotenv (= 2.1.1)
railties (>= 4.0, < 5.1)
erubis (2.7.0)
execjs (2.6.0)
globalid (0.3.6)
execjs (2.7.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
foundation-rails (6.2.4.0)
railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5)
sprockets-es6 (>= 0.9.0)
globalid (0.3.7)
activesupport (>= 4.1.0)
hashie (3.4.6)
i18n (0.7.0)
jbuilder (2.4.1)
jbuilder (2.6.0)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jquery-rails (4.1.1)
jquery-rails (4.2.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
turbolinks
json (1.8.3)
jwt (1.5.6)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
mime-types (3.0)
method_source (0.8.2)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0221)
mini_portile2 (2.0.0)
minitest (5.8.4)
multi_json (1.11.3)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.9.1)
multi_json (1.12.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
oauth2 (1.2.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
omniauth (1.3.1)
hashie (>= 1.2, < 4)
rack (>= 1.0, < 3)
omniauth-github (1.1.2)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-oauth2 (1.4.0)
oauth2 (~> 1.0)
omniauth (~> 1.2)
pg (0.19.0)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.6)
actionmailer (= 4.2.6)
actionpack (= 4.2.6)
actionview (= 4.2.6)
activejob (= 4.2.6)
activemodel (= 4.2.6)
activerecord (= 4.2.6)
activesupport (= 4.2.6)
rails (4.2.7)
actionmailer (= 4.2.7)
actionpack (= 4.2.7)
actionview (= 4.2.7)
activejob (= 4.2.7)
activemodel (= 4.2.7)
activerecord (= 4.2.7)
activesupport (= 4.2.7)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.6)
railties (= 4.2.7)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-erd (1.5.0)
activerecord (>= 3.2)
activesupport (>= 3.2)
choice (~> 0.2.0)
ruby-graphviz (~> 1.2)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (4.2.6)
actionpack (= 4.2.6)
activesupport (= 4.2.6)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (4.2.7)
actionpack (= 4.2.7)
activesupport (= 4.2.7)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (11.1.2)
rake (11.3.0)
rdoc (4.2.2)
json (~> 1.4)
ruby-graphviz (1.2.2)
sass (3.4.22)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sdoc (0.4.1)
sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
spring (1.7.1)
sprockets (3.6.0)
simplecov (0.12.0)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
spring (2.0.0)
activesupport (>= 4.2)
sprockets (3.7.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.4)
sprockets-es6 (0.9.2)
babel-source (>= 5.8.11)
babel-transpiler
sprockets (>= 3.0.0)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.12)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.2)
turbolinks (2.5.3)
coffee-rails
tilt (2.0.5)
turbolinks (5.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (3.0.0)
uglifier (3.0.3)
execjs (>= 0.3.0, < 3)
web-console (2.3.0)
activemodel (>= 4.0)
Expand All @@ -142,20 +215,30 @@ PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
byebug
coffee-rails (~> 4.1.0)
dotenv-rails
foundation-rails
jbuilder (~> 2.0)
jquery-rails
rails (= 4.2.6)
jquery-turbolinks
omniauth
omniauth-github
pg
pry
rails (= 4.2.7)
rails-erd
rails_12factor
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
simplecov
spring
sqlite3
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)

RUBY VERSION
ruby 2.3.1p112

BUNDLED WITH
1.13.5
1.13.6
Loading