Skip to content

Commit 81aa7c5

Browse files
author
Marylou Lenhart
committed
Merge branch 'master' of git://github.com/hacketyhack/hackety-hack.com
Conflicts: models/hacker.rb views/hackers/followers.haml views/hackers/following.haml views/layout.haml views/stylesheets/site.sass
2 parents 1bfd36d + 83f71f0 commit 81aa7c5

267 files changed

Lines changed: 6032 additions & 2533 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: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
log/*
1+
.bundle
22
db/*.sqlite3
3-
rerun.txt
3+
log/*.log
4+
tmp/
5+
.sass-cache/
6+
*.rbc
7+
.DS_Store
48
*.swp
5-
*~
6-
.bundle/*
9+
.redcar

‎.rspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--colour

‎.rvmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rvm use --create ruby-1.9.2-p290@hackety-hack.com

‎.travis.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
script: "rake spec && rake cucumber"
2+
rvm: 1.9.2
3+
notifications:
4+
irc: "irc.freenode.org#hacketyhack"
5+

‎Gemfile‎

Lines changed: 54 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,55 @@
1-
#The first part of any Gemfile is to list sources.
2-
#Most gems are located at rubygems.org
3-
source "http://rubygems.org"
4-
5-
#after that, we use the 'gem' statement to list what gems we want to use.
6-
#we can also add version requirements so that we get the exact version.
7-
8-
#see more at http://gembundler.com/
9-
10-
gem "sinatra", "=1.0"
11-
gem "haml", "3.0.13"
12-
gem "rspec", "=1.3.0"
13-
gem "cucumber"
14-
gem "webrat"
15-
gem "mongo_mapper", "=0.8.2"
16-
gem "cucumber-sinatra"
17-
gem "capybara"
18-
gem "factory_girl", "=1.3.1"
19-
gem "database_cleaner", "=0.5.2"
20-
gem "rack-flash", "=0.1.1"
21-
gem "rdiscount", "=1.6.5"
22-
gem "autotest"
23-
if RUBY_PLATFORM =~ /darwin/
24-
gem "autotest-fsevent"
25-
gem "autotest-growl"
1+
source 'http://rubygems.org'
2+
3+
gem 'rails', '3.1.0'
4+
gem 'json'
5+
6+
gem 'haml-rails'
7+
gem 'jquery-rails'
8+
gem 'mongo_mapper'
9+
gem 'bson_ext'
10+
11+
# Gems used only for assets and not required
12+
# in production environments by default.
13+
group :assets do
14+
gem 'sass-rails', " ~> 3.1.0"
15+
gem 'coffee-rails', "~> 3.1.0"
16+
gem 'uglifier'
17+
end
18+
19+
gem 'jnunemaker-validatable', '>= 1.8.4' # Required by mm-devise
20+
gem 'devise', '>= 1.2'
21+
gem 'mm-devise', '>= 1.2'
22+
gem 'cancan'
23+
24+
gem 'inherited_resources'
25+
gem 'simple_form', :git => "https://github.com/bitzesty/bootstrap_form.git"
26+
gem "semantic_menu", :git => "git://github.com/michaek/semantic_menu.git"
27+
28+
gem 'will_paginate' # Pagination
29+
gem 'rdiscount' # Markdown
30+
31+
32+
group :development do
33+
# Use unicorn as the web server
34+
gem 'unicorn'
35+
end
36+
37+
38+
group :development, :test do
39+
gem 'fabrication'
40+
gem 'rspec-rails'
41+
gem 'cucumber-rails'
42+
gem "faker"
43+
gem 'pry'
44+
gem 'sqlite3'
45+
end
46+
47+
group :production do
48+
gem 'pg' # ugh heroku
49+
end
50+
51+
group :test do
52+
gem "mocha"
53+
gem "database_cleaner"
54+
gem "launchy"
2655
end
27-
gem "bson_ext", ">=1.0.4"
28-
gem "launchy"

‎Gemfile.lock‎

Lines changed: 265 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,265 @@
1+
GIT
2+
remote: git://github.com/michaek/semantic_menu.git
3+
revision: 5298f586467cc9a91e85befcca673b8406c8846f
4+
specs:
5+
semantic_menu (0.1.0)
6+
7+
GIT
8+
remote: https://github.com/bitzesty/bootstrap_form.git
9+
revision: 1b33bf01c7daf56bb42e3f944d745ee25d620cca
10+
specs:
11+
simple_form (1.5.0.dev)
12+
actionpack (~> 3.0)
13+
activemodel (~> 3.0)
14+
15+
GEM
16+
remote: http://rubygems.org/
17+
specs:
18+
actionmailer (3.1.0)
19+
actionpack (= 3.1.0)
20+
mail (~> 2.3.0)
21+
actionpack (3.1.0)
22+
activemodel (= 3.1.0)
23+
activesupport (= 3.1.0)
24+
builder (~> 3.0.0)
25+
erubis (~> 2.7.0)
26+
i18n (~> 0.6)
27+
rack (~> 1.3.2)
28+
rack-cache (~> 1.0.3)
29+
rack-mount (~> 0.8.2)
30+
rack-test (~> 0.6.1)
31+
sprockets (~> 2.0.0)
32+
activemodel (3.1.0)
33+
activesupport (= 3.1.0)
34+
bcrypt-ruby (~> 3.0.0)
35+
builder (~> 3.0.0)
36+
i18n (~> 0.6)
37+
activerecord (3.1.0)
38+
activemodel (= 3.1.0)
39+
activesupport (= 3.1.0)
40+
arel (~> 2.2.1)
41+
tzinfo (~> 0.3.29)
42+
activeresource (3.1.0)
43+
activemodel (= 3.1.0)
44+
activesupport (= 3.1.0)
45+
activesupport (3.1.0)
46+
multi_json (~> 1.0)
47+
addressable (2.2.6)
48+
arel (2.2.1)
49+
bcrypt-ruby (3.0.1)
50+
bson (1.5.2)
51+
bson_ext (1.5.2)
52+
bson (= 1.5.2)
53+
builder (3.0.0)
54+
cancan (1.6.7)
55+
capybara (1.1.2)
56+
mime-types (>= 1.16)
57+
nokogiri (>= 1.3.3)
58+
rack (>= 1.0.0)
59+
rack-test (>= 0.5.4)
60+
selenium-webdriver (~> 2.0)
61+
xpath (~> 0.1.4)
62+
childprocess (0.2.6)
63+
ffi (~> 1.0.6)
64+
coderay (0.9.8)
65+
coffee-rails (3.1.1)
66+
coffee-script (>= 2.2.0)
67+
railties (~> 3.1.0)
68+
coffee-script (2.2.0)
69+
coffee-script-source
70+
execjs
71+
coffee-script-source (1.2.0)
72+
cucumber (1.1.4)
73+
builder (>= 2.1.2)
74+
diff-lcs (>= 1.1.2)
75+
gherkin (~> 2.7.1)
76+
json (>= 1.4.6)
77+
term-ansicolor (>= 1.0.6)
78+
cucumber-rails (1.2.1)
79+
capybara (>= 1.1.2)
80+
cucumber (>= 1.1.3)
81+
nokogiri (>= 1.5.0)
82+
database_cleaner (0.7.0)
83+
devise (1.5.3)
84+
bcrypt-ruby (~> 3.0)
85+
orm_adapter (~> 0.0.3)
86+
warden (~> 1.1)
87+
diff-lcs (1.1.3)
88+
erubis (2.7.0)
89+
execjs (1.2.13)
90+
multi_json (~> 1.0)
91+
fabrication (1.2.0)
92+
faker (1.0.1)
93+
i18n (~> 0.4)
94+
ffi (1.0.11)
95+
gherkin (2.7.2)
96+
json (>= 1.4.6)
97+
haml (3.1.4)
98+
haml-rails (0.3.4)
99+
actionpack (~> 3.0)
100+
activesupport (~> 3.0)
101+
haml (~> 3.0)
102+
railties (~> 3.0)
103+
has_scope (0.5.1)
104+
hike (1.2.1)
105+
i18n (0.6.0)
106+
inherited_resources (1.3.0)
107+
has_scope (~> 0.5.0)
108+
responders (~> 0.6.0)
109+
jnunemaker-validatable (1.8.4)
110+
activesupport (>= 2.3.4)
111+
jquery-rails (1.0.19)
112+
railties (~> 3.0)
113+
thor (~> 0.14)
114+
json (1.6.4)
115+
kgio (2.7.2)
116+
launchy (2.0.5)
117+
addressable (~> 2.2.6)
118+
mail (2.3.0)
119+
i18n (>= 0.4.0)
120+
mime-types (~> 1.16)
121+
treetop (~> 1.4.8)
122+
metaclass (0.0.1)
123+
method_source (0.6.7)
124+
ruby_parser (>= 2.3.1)
125+
mime-types (1.17.2)
126+
mm-devise (1.3)
127+
devise (>= 1.2)
128+
mongo_mapper (>= 0.9.0)
129+
mocha (0.10.0)
130+
metaclass (~> 0.0.1)
131+
mongo (1.5.2)
132+
bson (= 1.5.2)
133+
mongo_mapper (0.10.1)
134+
activemodel (~> 3.0)
135+
activesupport (~> 3.0)
136+
plucky (~> 0.4.0)
137+
multi_json (1.0.4)
138+
nokogiri (1.5.0)
139+
orm_adapter (0.0.5)
140+
pg (0.12.2)
141+
plucky (0.4.3)
142+
mongo (~> 1.3)
143+
polyglot (0.3.3)
144+
pry (0.9.7.4)
145+
coderay (~> 0.9.8)
146+
method_source (~> 0.6.7)
147+
ruby_parser (>= 2.3.1)
148+
slop (~> 2.1.0)
149+
rack (1.3.6)
150+
rack-cache (1.0.3)
151+
rack (>= 0.4)
152+
rack-mount (0.8.3)
153+
rack (>= 1.0.0)
154+
rack-ssl (1.3.2)
155+
rack
156+
rack-test (0.6.1)
157+
rack (>= 1.0)
158+
rails (3.1.0)
159+
actionmailer (= 3.1.0)
160+
actionpack (= 3.1.0)
161+
activerecord (= 3.1.0)
162+
activeresource (= 3.1.0)
163+
activesupport (= 3.1.0)
164+
bundler (~> 1.0)
165+
railties (= 3.1.0)
166+
railties (3.1.0)
167+
actionpack (= 3.1.0)
168+
activesupport (= 3.1.0)
169+
rack-ssl (~> 1.3.2)
170+
rake (>= 0.8.7)
171+
rdoc (~> 3.4)
172+
thor (~> 0.14.6)
173+
raindrops (0.8.0)
174+
rake (0.9.2.2)
175+
rdiscount (1.6.8)
176+
rdoc (3.12)
177+
json (~> 1.4)
178+
responders (0.6.4)
179+
rspec (2.8.0)
180+
rspec-core (~> 2.8.0)
181+
rspec-expectations (~> 2.8.0)
182+
rspec-mocks (~> 2.8.0)
183+
rspec-core (2.8.0)
184+
rspec-expectations (2.8.0)
185+
diff-lcs (~> 1.1.2)
186+
rspec-mocks (2.8.0)
187+
rspec-rails (2.8.1)
188+
actionpack (>= 3.0)
189+
activesupport (>= 3.0)
190+
railties (>= 3.0)
191+
rspec (~> 2.8.0)
192+
ruby_parser (2.3.1)
193+
sexp_processor (~> 3.0)
194+
rubyzip (0.9.5)
195+
sass (3.1.12)
196+
sass-rails (3.1.5)
197+
actionpack (~> 3.1.0)
198+
railties (~> 3.1.0)
199+
sass (~> 3.1.10)
200+
tilt (~> 1.3.2)
201+
selenium-webdriver (2.16.0)
202+
childprocess (>= 0.2.5)
203+
ffi (~> 1.0.9)
204+
multi_json (~> 1.0.4)
205+
rubyzip
206+
sexp_processor (3.0.10)
207+
slop (2.1.0)
208+
sprockets (2.0.3)
209+
hike (~> 1.2)
210+
rack (~> 1.0)
211+
tilt (~> 1.1, != 1.3.0)
212+
sqlite3 (1.3.5)
213+
term-ansicolor (1.0.7)
214+
thor (0.14.6)
215+
tilt (1.3.3)
216+
treetop (1.4.10)
217+
polyglot
218+
polyglot (>= 0.3.1)
219+
tzinfo (0.3.31)
220+
uglifier (1.2.1)
221+
execjs (>= 0.3.0)
222+
multi_json (>= 1.0.2)
223+
unicorn (4.1.1)
224+
kgio (~> 2.4)
225+
rack
226+
raindrops (~> 0.6)
227+
warden (1.1.0)
228+
rack (>= 1.0)
229+
will_paginate (3.0.2)
230+
xpath (0.1.4)
231+
nokogiri (~> 1.3)
232+
233+
PLATFORMS
234+
ruby
235+
236+
DEPENDENCIES
237+
bson_ext
238+
cancan
239+
coffee-rails (~> 3.1.0)
240+
cucumber-rails
241+
database_cleaner
242+
devise (>= 1.2)
243+
fabrication
244+
faker
245+
haml-rails
246+
inherited_resources
247+
jnunemaker-validatable (>= 1.8.4)
248+
jquery-rails
249+
json
250+
launchy
251+
mm-devise (>= 1.2)
252+
mocha
253+
mongo_mapper
254+
pg
255+
pry
256+
rails (= 3.1.0)
257+
rdiscount
258+
rspec-rails
259+
sass-rails (~> 3.1.0)
260+
semantic_menu!
261+
simple_form!
262+
sqlite3
263+
uglifier
264+
unicorn
265+
will_paginate

0 commit comments

Comments
 (0)