Skip to content

Commit faab542

Browse files
maccmanmaccman
committed
Holla 2 - complete rewrite
1 parent 077108a commit faab542

221 files changed

Lines changed: 8553 additions & 14641 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
.bundle
22
db/*.sqlite3
33
log/*.log
4-
tmp/**/*
5-
vendor/bundle
6-
vendor/gems
4+
tmp/

‎Gemfile‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
1-
# Edit this Gemfile to bundle your application's dependencies.
2-
source 'http://rubygems.org'
1+
source "http://rubygems.org"
32

4-
gem "rails", "= 3.0.0"
5-
6-
gem "authlogic", :git => "git://github.com/maccman/authlogic.git"
7-
gem "redis", ">= 2.0.0.rc2"
8-
gem "supermodel", :git => "git://github.com/maccman/supermodel.git"
9-
gem "juggernaut", ">= 2.0.0.beta3"
10-
11-
gem "paperclip", :git => "git://github.com/thoughtbot/paperclip.git"
12-
gem "aws-s3", :require => "aws/s3"
3+
gem "rails", "3.0.5"
134

145
gem "less", :git => "git://github.com/maccman/less.git"
156
gem "rack-less"
167
gem "rack-sprockets"
178
gem "yui-compressor"
9+
gem "supermodel"
10+
11+
gem "mysql2"
12+
gem "juggernaut"
13+
gem "thin"
14+
15+
gem "omniauth"
1816

1917
group :development do
2018
gem "ruby-debug19", :require => "ruby-debug"
21-
end
22-
23-
gem "mysql2"
24-
gem "thin"
19+
end

‎Gemfile.lock‎

Lines changed: 120 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
GIT
2-
remote: git://github.com/maccman/authlogic.git
3-
revision: acddb9d8b91f6da23268ed67248f430af3513a3a
4-
specs:
5-
authlogic (2.1.5)
6-
activesupport
7-
81
GIT
92
remote: git://github.com/maccman/less.git
103
revision: b25c0c7ed7cabffdbb0146044c36b5deb597399a
@@ -13,103 +6,137 @@ GIT
136
mutter (>= 0.4.2)
147
treetop (>= 1.4.2)
158

16-
GIT
17-
remote: git://github.com/maccman/supermodel.git
18-
revision: 3599867fe915a209612cf24eb326d04b1355b752
19-
specs:
20-
supermodel (0.1.4)
21-
activemodel (~> 3.0.0)
22-
23-
GIT
24-
remote: git://github.com/thoughtbot/paperclip.git
25-
revision: ef7233d25700a7e69cebd2334b656fa9ca0ae927
26-
specs:
27-
paperclip (2.3.4)
28-
activerecord
29-
activesupport
30-
319
GEM
3210
remote: http://rubygems.org/
3311
specs:
3412
abstract (1.0.0)
35-
actionmailer (3.0.0)
36-
actionpack (= 3.0.0)
37-
mail (~> 2.2.5)
38-
actionpack (3.0.0)
39-
activemodel (= 3.0.0)
40-
activesupport (= 3.0.0)
13+
actionmailer (3.0.5)
14+
actionpack (= 3.0.5)
15+
mail (~> 2.2.15)
16+
actionpack (3.0.5)
17+
activemodel (= 3.0.5)
18+
activesupport (= 3.0.5)
4119
builder (~> 2.1.2)
4220
erubis (~> 2.6.6)
43-
i18n (~> 0.4.1)
21+
i18n (~> 0.4)
4422
rack (~> 1.2.1)
45-
rack-mount (~> 0.6.12)
46-
rack-test (~> 0.5.4)
23+
rack-mount (~> 0.6.13)
24+
rack-test (~> 0.5.7)
4725
tzinfo (~> 0.3.23)
48-
activemodel (3.0.0)
49-
activesupport (= 3.0.0)
26+
activemodel (3.0.5)
27+
activesupport (= 3.0.5)
5028
builder (~> 2.1.2)
51-
i18n (~> 0.4.1)
52-
activerecord (3.0.0)
53-
activemodel (= 3.0.0)
54-
activesupport (= 3.0.0)
55-
arel (~> 1.0.0)
29+
i18n (~> 0.4)
30+
activerecord (3.0.5)
31+
activemodel (= 3.0.5)
32+
activesupport (= 3.0.5)
33+
arel (~> 2.0.2)
5634
tzinfo (~> 0.3.23)
57-
activeresource (3.0.0)
58-
activemodel (= 3.0.0)
59-
activesupport (= 3.0.0)
60-
activesupport (3.0.0)
35+
activeresource (3.0.5)
36+
activemodel (= 3.0.5)
37+
activesupport (= 3.0.5)
38+
activesupport (3.0.5)
39+
addressable (2.2.4)
6140
archive-tar-minitar (0.5.2)
62-
arel (1.0.1)
63-
activesupport (~> 3.0.0)
64-
aws-s3 (0.6.2)
65-
builder
66-
mime-types
67-
xml-simple
41+
arel (2.0.9)
6842
builder (2.1.2)
69-
columnize (0.3.1)
43+
columnize (0.3.2)
7044
daemons (1.1.0)
7145
erubis (2.6.6)
7246
abstract (>= 1.0.0)
7347
eventmachine (0.12.10)
74-
i18n (0.4.1)
75-
juggernaut (2.0.0.beta3)
48+
faraday (0.5.7)
49+
addressable (~> 2.2.4)
50+
multipart-post (~> 1.1.0)
51+
rack (< 2, >= 1.1.0)
52+
i18n (0.5.0)
53+
juggernaut (2.0.1)
7654
redis
7755
linecache19 (0.5.11)
7856
ruby_core_source (>= 0.1.4)
79-
mail (2.2.7)
57+
mail (2.2.15)
8058
activesupport (>= 2.3.6)
81-
mime-types
82-
treetop (>= 1.4.5)
59+
i18n (>= 0.4.0)
60+
mime-types (~> 1.16)
61+
treetop (~> 1.4.8)
8362
mime-types (1.16)
63+
multi_json (0.0.5)
64+
multipart-post (1.1.0)
8465
mutter (0.5.3)
85-
mysql2 (0.2.4)
66+
mysql2 (0.2.6)
67+
net-ldap (0.1.1)
68+
nokogiri (1.4.4)
69+
oa-basic (0.2.0)
70+
multi_json (~> 0.0.2)
71+
nokogiri (~> 1.4.2)
72+
oa-core (= 0.2.0)
73+
rest-client (~> 1.6.0)
74+
oa-core (0.2.0)
75+
rack (~> 1.1)
76+
oa-enterprise (0.2.0)
77+
net-ldap (~> 0.1.1)
78+
nokogiri (~> 1.4.2)
79+
oa-core (= 0.2.0)
80+
pyu-ruby-sasl (~> 0.0.3.1)
81+
rubyntlm (~> 0.1.1)
82+
oa-more (0.2.0)
83+
multi_json (~> 0.0.2)
84+
oa-core (= 0.2.0)
85+
rest-client (~> 1.6.0)
86+
oa-oauth (0.2.0)
87+
multi_json (~> 0.0.2)
88+
nokogiri (~> 1.4.2)
89+
oa-core (= 0.2.0)
90+
oauth (~> 0.4.0)
91+
oauth2 (~> 0.1.1)
92+
oa-openid (0.2.0)
93+
oa-core (= 0.2.0)
94+
rack-openid (~> 1.2.0)
95+
ruby-openid-apps-discovery
96+
oauth (0.4.4)
97+
oauth2 (0.1.1)
98+
faraday (~> 0.5.0)
99+
multi_json (~> 0.0.4)
100+
omniauth (0.2.0)
101+
oa-basic (= 0.2.0)
102+
oa-core (= 0.2.0)
103+
oa-enterprise (= 0.2.0)
104+
oa-more (= 0.2.0)
105+
oa-oauth (= 0.2.0)
106+
oa-openid (= 0.2.0)
86107
polyglot (0.3.1)
87-
rack (1.2.1)
88-
rack-less (1.5.0)
89-
less (>= 1.2.21)
90-
rack (>= 0.4)
91-
rack-mount (0.6.13)
108+
pyu-ruby-sasl (0.0.3.2)
109+
rack (1.2.2)
110+
rack-less (2.0.0)
111+
less (~> 1.2)
112+
rack (~> 1.0)
113+
rack-mount (0.6.14)
92114
rack (>= 1.0.0)
93-
rack-sprockets (1.0.4)
94-
rack (>= 0.4)
95-
sprockets (>= 1.0.0)
96-
rack-test (0.5.6)
115+
rack-openid (1.2.0)
116+
rack (>= 1.1.0)
117+
ruby-openid (>= 2.1.8)
118+
rack-sprockets (1.1.0)
119+
rack (~> 1.0)
120+
sprockets (~> 1.0)
121+
rack-test (0.5.7)
97122
rack (>= 1.0)
98-
rails (3.0.0)
99-
actionmailer (= 3.0.0)
100-
actionpack (= 3.0.0)
101-
activerecord (= 3.0.0)
102-
activeresource (= 3.0.0)
103-
activesupport (= 3.0.0)
104-
bundler (~> 1.0.0)
105-
railties (= 3.0.0)
106-
railties (3.0.0)
107-
actionpack (= 3.0.0)
108-
activesupport (= 3.0.0)
109-
rake (>= 0.8.4)
110-
thor (~> 0.14.0)
123+
rails (3.0.5)
124+
actionmailer (= 3.0.5)
125+
actionpack (= 3.0.5)
126+
activerecord (= 3.0.5)
127+
activeresource (= 3.0.5)
128+
activesupport (= 3.0.5)
129+
bundler (~> 1.0)
130+
railties (= 3.0.5)
131+
railties (3.0.5)
132+
actionpack (= 3.0.5)
133+
activesupport (= 3.0.5)
134+
rake (>= 0.8.7)
135+
thor (~> 0.14.4)
111136
rake (0.8.7)
112-
redis (2.0.11)
137+
redis (2.1.1)
138+
rest-client (1.6.1)
139+
mime-types (>= 1.16)
113140
ruby-debug-base19 (0.11.24)
114141
columnize (>= 0.3.1)
115142
linecache19 (>= 0.5.11)
@@ -118,35 +145,37 @@ GEM
118145
columnize (>= 0.3.1)
119146
linecache19 (>= 0.5.11)
120147
ruby-debug-base19 (>= 0.11.19)
148+
ruby-openid (2.1.8)
149+
ruby-openid-apps-discovery (1.2.0)
150+
ruby-openid (>= 2.1.7)
121151
ruby_core_source (0.1.4)
122152
archive-tar-minitar (>= 0.5.2)
153+
rubyntlm (0.1.1)
123154
sprockets (1.0.2)
124-
thin (1.2.7)
155+
supermodel (0.1.4)
156+
activemodel (>= 3.0.0.beta)
157+
thin (1.2.10)
125158
daemons (>= 1.0.9)
126159
eventmachine (>= 0.12.6)
127160
rack (>= 1.0.0)
128-
thor (0.14.3)
129-
treetop (1.4.8)
161+
thor (0.14.6)
162+
treetop (1.4.9)
130163
polyglot (>= 0.3.1)
131-
tzinfo (0.3.23)
132-
xml-simple (1.0.12)
133-
yui-compressor (0.9.1)
164+
tzinfo (0.3.25)
165+
yui-compressor (0.9.4)
134166

135167
PLATFORMS
136168
ruby
137169

138170
DEPENDENCIES
139-
authlogic!
140-
aws-s3
141-
juggernaut (>= 2.0.0.beta3)
171+
juggernaut
142172
less!
143173
mysql2
144-
paperclip!
174+
omniauth
145175
rack-less
146176
rack-sprockets
147-
rails (= 3.0.0)
148-
redis (>= 2.0.0.rc2)
177+
rails (= 3.0.5)
149178
ruby-debug19
150-
supermodel!
179+
supermodel
151180
thin
152181
yui-compressor

‎MIT-LICENSE‎

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

0 commit comments

Comments
 (0)