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

Make it kinda work again #1

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '3.2.6'
gem 'rails', '3.2.18'
gem 'bootstrap-sass', '2.0.0'
gem 'will_paginate', '3.0.3'
gem 'bootstrap-will_paginate', '0.0.6'
Expand All @@ -17,13 +17,15 @@ end
# in production environments by default.
group :assets do
gem 'sass-rails', '3.2.4'
gem 'sass', '3.2.13'
gem 'coffee-rails', '3.2.2'

gem 'uglifier', '1.2.3'
end

gem 'jquery-rails', '2.0.0'
gem 'jquery-rails', '2.0.3'

group :production do
gem 'pg', '0.12.2'
end
gem 'rails_12factor'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's this new gem for?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For fixing warnings... no idea really.

end
132 changes: 70 additions & 62 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,112 +1,118 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.6)
actionpack (= 3.2.6)
mail (~> 2.4.4)
actionpack (3.2.6)
activemodel (= 3.2.6)
activesupport (= 3.2.6)
actionmailer (3.2.18)
actionpack (= 3.2.18)
mail (~> 2.5.4)
actionpack (3.2.18)
activemodel (= 3.2.18)
activesupport (= 3.2.18)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
rack (~> 1.4.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.3)
activemodel (3.2.6)
activesupport (= 3.2.6)
sprockets (~> 2.2.1)
activemodel (3.2.18)
activesupport (= 3.2.18)
builder (~> 3.0.0)
activerecord (3.2.6)
activemodel (= 3.2.6)
activesupport (= 3.2.6)
activerecord (3.2.18)
activemodel (= 3.2.18)
activesupport (= 3.2.18)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.6)
activemodel (= 3.2.6)
activesupport (= 3.2.6)
activesupport (3.2.6)
i18n (~> 0.6)
activeresource (3.2.18)
activemodel (= 3.2.18)
activesupport (= 3.2.18)
activesupport (3.2.18)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
arel (3.0.2)
arel (3.0.3)
bootstrap-sass (2.0.0)
bootstrap-will_paginate (0.0.6)
will_paginate
builder (3.0.0)
builder (3.0.4)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.3.3)
coffee-script-source (1.9.1)
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
hike (1.2.1)
i18n (0.6.0)
execjs (2.4.0)
hike (1.2.3)
httpclient (2.6.0.1)
i18n (0.7.0)
journey (1.0.4)
jquery-rails (2.0.0)
railties (>= 3.2.0.beta, < 5.0)
jquery-rails (2.0.3)
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
json (1.7.3)
mail (2.4.4)
i18n (>= 0.4.0)
json (1.8.2)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
multi_json (1.3.6)
mime-types (1.25.1)
multi_json (1.11.0)
pg (0.12.2)
polyglot (0.3.3)
pusher (0.9.4)
polyglot (0.3.5)
pusher (0.14.4)
httpclient (~> 2.5)
multi_json (~> 1.0)
signature (~> 0.1.2)
rack (1.4.1)
signature (~> 0.1.8)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack-ssl (1.3.4)
rack
rack-test (0.6.1)
rack-test (0.6.3)
rack (>= 1.0)
rails (3.2.6)
actionmailer (= 3.2.6)
actionpack (= 3.2.6)
activerecord (= 3.2.6)
activeresource (= 3.2.6)
activesupport (= 3.2.6)
rails (3.2.18)
actionmailer (= 3.2.18)
actionpack (= 3.2.18)
activerecord (= 3.2.18)
activeresource (= 3.2.18)
activesupport (= 3.2.18)
bundler (~> 1.0)
railties (= 3.2.6)
railties (3.2.6)
actionpack (= 3.2.6)
activesupport (= 3.2.6)
railties (= 3.2.18)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.4)
rails_stdout_logging (0.0.3)
railties (3.2.18)
actionpack (= 3.2.18)
activesupport (= 3.2.18)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
rdoc (3.12)
rake (10.4.2)
rdoc (3.12.2)
json (~> 1.4)
sass (3.1.19)
sass (3.2.13)
sass-rails (3.2.4)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
signature (0.1.3)
sprockets (2.1.3)
signature (0.1.8)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.5)
thor (0.15.3)
tilt (1.3.3)
treetop (1.4.10)
thor (0.19.1)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.33)
tzinfo (0.3.43)
uglifier (1.2.3)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
uuidtools (2.1.2)
uuidtools (2.1.5)
will_paginate (3.0.3)

PLATFORMS
Expand All @@ -116,10 +122,12 @@ DEPENDENCIES
bootstrap-sass (= 2.0.0)
bootstrap-will_paginate (= 0.0.6)
coffee-rails (= 3.2.2)
jquery-rails (= 2.0.0)
jquery-rails (= 2.0.3)
pg (= 0.12.2)
pusher
rails (= 3.2.6)
rails (= 3.2.18)
rails_12factor
sass (= 3.2.13)
sass-rails (= 3.2.4)
sqlite3 (= 1.3.5)
uglifier (= 1.2.3)
Expand Down
4 changes: 2 additions & 2 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>the hacker school confessional</title>
<title>the VU koor confessional</title>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you leave this change out of the PR please?

<%= stylesheet_link_tag "application", :media => "all" %>
<%= javascript_include_tag "application" %>
<%= csrf_meta_tags %>
Expand All @@ -17,7 +17,7 @@
<div id="wrapper" class="center">
<h1>
<%= link_to(confessions_path) do %>
$ the hacker school confessional<span class="blink cursor">&nbsp;</span>
$ the VU koor confessional<span class="blink cursor">&nbsp;</span>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

<% end %>
</h1>

Expand Down
6 changes: 6 additions & 0 deletions config/environments/production.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
Confessional::Application.configure do

require 'pusher'

Pusher.app_id = '112785'
Pusher.key = 'c2c3fbab7bc6f31e77e7'
Pusher.secret = 'fb9026ac4a28ac41ce1c'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm guessing you don't want to share this publically...?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Care. Can't be bothered to remember how to cherry pick. I'll do a new PR "sometime".

# Settings specified here will take precedence over those in config/application.rb

# Code is not reloaded between requests
Expand Down
Empty file removed vendor/plugins/.gitkeep
Empty file.