Skip to content

Commit e4d9c19

Browse files
author
Zouroborus
committed
Starting over
Generated models.
1 parent c5664d3 commit e4d9c19

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+991
-402
lines changed

.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
#
33
# If you find yourself ignoring temporary files generated by your text editor
44
# or operating system, you probably want to add a global ignore instead:
5-
# git config --global core.excludesfile '~/.gitignore_global'
5+
# git config --global core.excludesfile ~/.gitignore_global
66

7-
# Ignore bundler config.
7+
# Ignore bundler config
88
/.bundle
99

1010
# Ignore the default SQLite database.
1111
/db/*.sqlite3
12-
/db/*.sqlite3-journal
1312

1413
# Ignore all logfiles and tempfiles.
1514
/log/*.log

1.3.8

Lines changed: 0 additions & 3 deletions
This file was deleted.

Gemfile

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,38 @@
11
source 'https://rubygems.org'
22

3-
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
4-
gem 'rails', '4.0.0'
3+
gem 'rails', '3.2.13'
54

6-
# Use sqlite3 as the database for Active Record
7-
gem 'sqlite3', '>= 1.3.7'
5+
# Bundle edge Rails instead:
6+
# gem 'rails', :git => 'git://github.com/rails/rails.git'
87

9-
# Use SCSS for stylesheets
10-
gem 'sass-rails', '~> 4.0.0'
8+
gem 'sqlite3'
119

12-
# Use Uglifier as compressor for JavaScript assets
13-
gem 'uglifier', '>= 1.3.0'
1410

15-
# Use CoffeeScript for .js.coffee assets and views
16-
gem 'coffee-rails', '~> 4.0.0'
11+
# Gems used only for assets and not required
12+
# in production environments by default.
13+
group :assets do
14+
gem 'sass-rails', '~> 3.2.3'
15+
gem 'coffee-rails', '~> 3.2.1'
1716

18-
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
19-
# gem 'therubyracer', platforms: :ruby
17+
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
18+
# gem 'therubyracer', :platforms => :ruby
2019

21-
# Use jquery as the JavaScript library
22-
gem 'jquery-rails'
23-
24-
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
25-
gem 'turbolinks'
26-
27-
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
28-
gem 'jbuilder', '~> 1.2'
29-
30-
group :doc do
31-
# bundle exec rake doc:rails generates the API under doc/api.
32-
gem 'sdoc', require: false
20+
gem 'uglifier', '>= 1.0.3'
3321
end
3422

35-
# Use ActiveModel has_secure_password
23+
gem 'jquery-rails'
24+
25+
# To use ActiveModel has_secure_password
3626
# gem 'bcrypt-ruby', '~> 3.0.0'
3727

28+
# To use Jbuilder templates for JSON
29+
# gem 'jbuilder'
30+
3831
# Use unicorn as the app server
3932
# gem 'unicorn'
4033

41-
# Use Capistrano for deployment
42-
# gem 'capistrano', group: :development
43-
44-
# Use debugger
45-
# gem 'debugger', group: [:development, :test]
34+
# Deploy with Capistrano
35+
# gem 'capistrano'
4636

37+
# To use debugger
38+
# gem 'debugger'

Gemfile.lock

Lines changed: 65 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,110 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.0.0)
5-
actionpack (= 4.0.0)
4+
actionmailer (3.2.13)
5+
actionpack (= 3.2.13)
66
mail (~> 2.5.3)
7-
actionpack (4.0.0)
8-
activesupport (= 4.0.0)
9-
builder (~> 3.1.0)
7+
actionpack (3.2.13)
8+
activemodel (= 3.2.13)
9+
activesupport (= 3.2.13)
10+
builder (~> 3.0.0)
1011
erubis (~> 2.7.0)
11-
rack (~> 1.5.2)
12-
rack-test (~> 0.6.2)
13-
activemodel (4.0.0)
14-
activesupport (= 4.0.0)
15-
builder (~> 3.1.0)
16-
activerecord (4.0.0)
17-
activemodel (= 4.0.0)
18-
activerecord-deprecated_finders (~> 1.0.2)
19-
activesupport (= 4.0.0)
20-
arel (~> 4.0.0)
21-
activerecord-deprecated_finders (1.0.3)
22-
activesupport (4.0.0)
23-
i18n (~> 0.6, >= 0.6.4)
24-
minitest (~> 4.2)
25-
multi_json (~> 1.3)
26-
thread_safe (~> 0.1)
27-
tzinfo (~> 0.3.37)
28-
arel (4.0.0)
29-
atomic (1.1.14)
30-
builder (3.1.4)
31-
coffee-rails (4.0.0)
12+
journey (~> 1.0.4)
13+
rack (~> 1.4.5)
14+
rack-cache (~> 1.2)
15+
rack-test (~> 0.6.1)
16+
sprockets (~> 2.2.1)
17+
activemodel (3.2.13)
18+
activesupport (= 3.2.13)
19+
builder (~> 3.0.0)
20+
activerecord (3.2.13)
21+
activemodel (= 3.2.13)
22+
activesupport (= 3.2.13)
23+
arel (~> 3.0.2)
24+
tzinfo (~> 0.3.29)
25+
activeresource (3.2.13)
26+
activemodel (= 3.2.13)
27+
activesupport (= 3.2.13)
28+
activesupport (3.2.13)
29+
i18n (= 0.6.1)
30+
multi_json (~> 1.0)
31+
arel (3.0.3)
32+
builder (3.0.4)
33+
coffee-rails (3.2.2)
3234
coffee-script (>= 2.2.0)
33-
railties (>= 4.0.0.beta, < 5.0)
35+
railties (~> 3.2.0)
3436
coffee-script (2.2.0)
3537
coffee-script-source
3638
execjs
3739
coffee-script-source (1.6.3)
3840
erubis (2.7.0)
3941
execjs (2.0.2)
4042
hike (1.2.3)
41-
i18n (0.6.5)
42-
jbuilder (1.5.1)
43-
activesupport (>= 3.0.0)
44-
multi_json (>= 1.2.0)
43+
i18n (0.6.1)
44+
journey (1.0.4)
4545
jquery-rails (3.0.4)
4646
railties (>= 3.0, < 5.0)
4747
thor (>= 0.14, < 2.0)
48-
json (1.8.0)
48+
json (1.8.1)
4949
mail (2.5.4)
5050
mime-types (~> 1.16)
5151
treetop (~> 1.4.8)
5252
mime-types (1.25)
53-
minitest (4.7.5)
54-
multi_json (1.8.0)
53+
multi_json (1.8.2)
5554
polyglot (0.3.3)
56-
rack (1.5.2)
55+
rack (1.4.5)
56+
rack-cache (1.2)
57+
rack (>= 0.4)
58+
rack-ssl (1.3.3)
59+
rack
5760
rack-test (0.6.2)
5861
rack (>= 1.0)
59-
rails (4.0.0)
60-
actionmailer (= 4.0.0)
61-
actionpack (= 4.0.0)
62-
activerecord (= 4.0.0)
63-
activesupport (= 4.0.0)
64-
bundler (>= 1.3.0, < 2.0)
65-
railties (= 4.0.0)
66-
sprockets-rails (~> 2.0.0)
67-
railties (4.0.0)
68-
actionpack (= 4.0.0)
69-
activesupport (= 4.0.0)
62+
rails (3.2.13)
63+
actionmailer (= 3.2.13)
64+
actionpack (= 3.2.13)
65+
activerecord (= 3.2.13)
66+
activeresource (= 3.2.13)
67+
activesupport (= 3.2.13)
68+
bundler (~> 1.0)
69+
railties (= 3.2.13)
70+
railties (3.2.13)
71+
actionpack (= 3.2.13)
72+
activesupport (= 3.2.13)
73+
rack-ssl (~> 1.3.2)
7074
rake (>= 0.8.7)
71-
thor (>= 0.18.1, < 2.0)
75+
rdoc (~> 3.4)
76+
thor (>= 0.14.6, < 2.0)
7277
rake (10.1.0)
7378
rdoc (3.12.2)
7479
json (~> 1.4)
75-
sass (3.2.11)
76-
sass-rails (4.0.0)
77-
railties (>= 4.0.0.beta, < 5.0)
80+
sass (3.2.12)
81+
sass-rails (3.2.6)
82+
railties (~> 3.2.0)
7883
sass (>= 3.1.10)
79-
sprockets-rails (~> 2.0.0)
80-
sdoc (0.3.20)
81-
json (>= 1.1.3)
82-
rdoc (~> 3.10)
83-
sprockets (2.10.0)
84+
tilt (~> 1.3)
85+
sprockets (2.2.2)
8486
hike (~> 1.2)
8587
multi_json (~> 1.0)
8688
rack (~> 1.0)
8789
tilt (~> 1.1, != 1.3.0)
88-
sprockets-rails (2.0.0)
89-
actionpack (>= 3.0)
90-
activesupport (>= 3.0)
91-
sprockets (~> 2.8)
9290
sqlite3 (1.3.8-x86-mingw32)
9391
thor (0.18.1)
94-
thread_safe (0.1.3)
95-
atomic
9692
tilt (1.4.1)
9793
treetop (1.4.15)
9894
polyglot
9995
polyglot (>= 0.3.1)
100-
turbolinks (1.3.0)
101-
coffee-rails
102-
tzinfo (0.3.37)
103-
uglifier (2.2.1)
96+
tzinfo (0.3.38)
97+
uglifier (2.3.1)
10498
execjs (>= 0.3.0)
105-
multi_json (~> 1.0, >= 1.0.2)
99+
json (>= 1.8.0)
106100

107101
PLATFORMS
108102
x86-mingw32
109103

110104
DEPENDENCIES
111-
coffee-rails (~> 4.0.0)
112-
jbuilder (~> 1.2)
105+
coffee-rails (~> 3.2.1)
113106
jquery-rails
114-
rails (= 4.0.0)
115-
sass-rails (~> 4.0.0)
116-
sdoc
117-
sqlite3 (>= 1.3.7)
118-
turbolinks
119-
uglifier (>= 1.3.0)
107+
rails (= 3.2.13)
108+
sass-rails (~> 3.2.3)
109+
sqlite3
110+
uglifier (>= 1.0.3)

0 commit comments

Comments
 (0)