Skip to content

Instantly share code, notes, and snippets.

@ryanschwartz

ryanschwartz/-

Forked from anonymous/-
Created May 23, 2013 02:21
Show Gist options
  • Save ryanschwartz/5632398 to your computer and use it in GitHub Desktop.
Save ryanschwartz/5632398 to your computer and use it in GitHub Desktop.
Download ZIP
strano diff
Raw
-
diff --git a/Gemfile b/Gemfile
index 30c8aab..451aa31 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,6 +12,11 @@ group :assets do
gem 'uglifier', '>= 1.0.3'
end
+#uhhhhhhhhhhhhhhhhhhhhhhhhh...
+gem 'therubyracer', '=0.11.4'
+gem 'less-rails-bootstrap'
+gem 'addressable'
+
gem 'jquery-rails'
gem 'twitter-bootstrap-rails'
gem 'sidekiq'
diff --git a/Gemfile.lock b/Gemfile.lock
index 50ab8ea..a059db7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,41 +1,42 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.11)
- actionpack (= 3.2.11)
- mail (~> 2.4.4)
- actionpack (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ actionmailer (3.2.13)
+ actionpack (= 3.2.13)
+ mail (~> 2.5.3)
+ actionpack (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
- rack (~> 1.4.0)
+ rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.11)
- activesupport (= 3.2.11)
+ activemodel (3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
- activerecord (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ activerecord (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
- activesupport (3.2.11)
- i18n (~> 0.6)
+ activeresource (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
+ activesupport (3.2.13)
+ i18n (= 0.6.1)
multi_json (~> 1.0)
- addressable (2.2.7)
- airbrake (3.0.9)
+ addressable (2.3.4)
+ airbrake (3.1.12)
activesupport
builder
+ json
ansible (0.2.0)
arel (3.0.2)
builder (3.0.4)
- capistrano (2.13.5)
+ capistrano (2.15.4)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
@@ -44,227 +45,261 @@ GEM
capistrano_colors (0.5.5)
capistrano_rsync_with_remote_cache (2.4.0)
capistrano (>= 2.1.0)
- celluloid (0.10.0)
- chronic (0.6.7)
+ celluloid (0.14.0)
+ timers (>= 1.0.0)
+ chronic (0.9.1)
+ coderay (1.0.9)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.2.0)
+ coffee-script-source (1.6.2)
columnize (0.3.6)
- commonjs (0.2.5)
- connection_pool (0.9.1)
- crack (0.3.1)
+ commonjs (0.2.6)
+ connection_pool (1.0.0)
+ crack (0.3.2)
daemons (1.1.9)
- database_cleaner (0.7.2)
- debugger (1.2.2)
+ database_cleaner (1.0.1)
+ debugger (1.6.0)
columnize (>= 0.3.1)
- debugger-linecache (~> 1.1.1)
- debugger-ruby_core_source (~> 1.1.5)
- debugger-linecache (1.1.2)
- debugger-ruby_core_source (>= 1.1.1)
- debugger-ruby_core_source (1.1.5)
- delayed_job (3.0.2)
+ debugger-linecache (~> 1.2.0)
+ debugger-ruby_core_source (~> 1.2.1)
+ debugger-linecache (1.2.0)
+ debugger-ruby_core_source (1.2.2)
+ delayed_job (3.0.5)
activesupport (~> 3.0)
- diff-lcs (1.1.3)
+ diff-lcs (1.2.4)
dotiw (1.1.1)
actionpack (~> 3)
erubis (2.7.0)
- eventmachine (1.0.0)
- execjs (1.3.0)
+ eventmachine (1.0.3)
+ execjs (1.4.0)
multi_json (~> 1.0)
- factory_girl (3.0.0)
+ factory_girl (4.2.0)
activesupport (>= 3.0.0)
- factory_girl_rails (3.0.0)
- factory_girl (~> 3.0.0)
+ factory_girl_rails (4.2.1)
+ factory_girl (~> 4.2.0)
railties (>= 3.0.0)
- fakefs (0.4.0)
- faraday (0.7.6)
- addressable (~> 2.2)
+ fakefs (0.4.2)
+ faraday (0.8.7)
multipart-post (~> 1.1)
- rack (~> 1.1)
- faraday-stack (0.1.5)
- faraday (>= 0.6, < 0.8)
- faraday_middleware (0.8.6)
+ faraday-stack (0.1.3)
+ faraday (~> 0.6)
+ faraday_middleware (0.9.0)
faraday (>= 0.7.4, < 0.9)
- ffaker (1.14.0)
- ffi (1.0.11)
- grit (2.4.1)
+ ffaker (1.16.1)
+ ffi (1.8.1)
+ formatador (0.2.4)
+ grit (2.5.0)
diff-lcs (~> 1.1)
mime-types (~> 1.15)
- guard (1.0.1)
- ffi (>= 0.5.0)
- thor (~> 0.14.6)
- guard-bundler (0.1.3)
- bundler (>= 1.0.0)
- guard (>= 0.2.2)
- guard-rspec (0.7.0)
- guard (>= 0.10.0)
+ posix-spawn (~> 0.3.6)
+ guard (1.8.0)
+ formatador (>= 0.2.4)
+ listen (>= 1.0.0)
+ lumberjack (>= 1.0.2)
+ pry (>= 0.9.10)
+ thor (>= 0.14.6)
+ guard-bundler (1.0.0)
+ bundler (~> 1.0)
+ guard (~> 1.1)
+ guard-rspec (3.0.0)
+ guard (>= 1.8)
+ rspec (~> 2.13)
has_scope (0.5.1)
- hashie (1.2.0)
- highline (1.6.15)
- hike (1.2.1)
+ hashie (2.0.5)
+ highline (1.6.19)
+ hike (1.2.2)
+ httpauth (0.2.0)
i18n (0.6.1)
- inherited_resources (1.3.1)
+ inherited_resources (1.4.0)
has_scope (~> 0.5.0)
- responders (~> 0.6)
+ responders (~> 0.9)
journey (1.0.4)
- jquery-rails (2.0.2)
- railties (>= 3.2.0, < 5.0)
- thor (~> 0.14)
- json (1.7.6)
- kaminari (0.13.0)
+ jquery-rails (2.2.1)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
+ json (1.8.0)
+ jwt (0.1.8)
+ multi_json (>= 1.5)
+ kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
- railties (>= 3.0.0)
- less (2.1.0)
- commonjs (~> 0.2.0)
- therubyracer (~> 0.10.0)
- less-rails (2.2.0)
+ less (2.3.2)
+ commonjs (~> 0.2.6)
+ less-rails (2.3.3)
actionpack (>= 3.1)
- less (~> 2.1.0)
- libv8 (3.3.10.4)
- mail (2.4.4)
- i18n (>= 0.4.0)
+ less (~> 2.3.1)
+ less-rails-bootstrap (2.3.2)
+ less-rails (~> 2.3.1)
+ libv8 (3.11.8.17)
+ listen (1.1.2)
+ rb-fsevent (>= 0.9.3)
+ rb-inotify (>= 0.9)
+ rb-kqueue (>= 0.2)
+ lumberjack (1.0.3)
+ mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
marked (1.2.2)
- mime-types (1.19)
- multi_json (1.5.0)
- multipart-post (1.1.5)
+ method_source (0.8.1)
+ mime-types (1.23)
+ multi_json (1.7.3)
+ multipart-post (1.2.0)
mysql2 (0.3.11)
- net-scp (1.0.4)
- net-ssh (>= 1.99.1)
- net-sftp (2.0.5)
- net-ssh (>= 2.0.9)
- net-ssh (2.6.2)
- net-ssh-gateway (1.1.0)
- net-ssh (>= 1.99.1)
- newrelic_rpm (3.3.3)
- oauth2 (0.5.2)
- faraday (~> 0.7)
+ net-scp (1.1.1)
+ net-ssh (>= 2.6.5)
+ net-sftp (2.1.2)
+ net-ssh (>= 2.6.5)
+ net-ssh (2.6.7)
+ net-ssh-gateway (1.2.0)
+ net-ssh (>= 2.6.5)
+ newrelic_rpm (3.6.2.96)
+ oauth2 (0.8.1)
+ faraday (~> 0.8)
+ httpauth (~> 0.1)
+ jwt (~> 0.1.4)
multi_json (~> 1.0)
- omniauth (1.0.3)
- hashie (~> 1.2)
+ rack (~> 1.2)
+ omniauth (1.1.4)
+ hashie (>= 1.2, < 3)
rack
- omniauth-github (1.0.1)
+ omniauth-github (1.1.0)
omniauth (~> 1.0)
- omniauth-oauth2 (~> 1.0)
- omniauth-oauth2 (1.0.0)
- oauth2 (~> 0.5.0)
+ omniauth-oauth2 (~> 1.1)
+ omniauth-oauth2 (1.1.1)
+ oauth2 (~> 0.8.0)
omniauth (~> 1.0)
open4 (1.3.0)
- permanent_records (2.1.2)
+ permanent_records (3.1.3)
activerecord
polyglot (0.3.3)
- rack (1.4.3)
+ posix-spawn (0.3.6)
+ pry (0.9.12.2)
+ coderay (~> 1.0.5)
+ method_source (~> 0.8)
+ slop (~> 3.4)
+ rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
- rack-protection (1.2.0)
+ rack-protection (1.5.0)
rack
- rack-ssl (1.3.2)
+ rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.11)
- actionmailer (= 3.2.11)
- actionpack (= 3.2.11)
- activerecord (= 3.2.11)
- activeresource (= 3.2.11)
- activesupport (= 3.2.11)
+ rails (3.2.13)
+ actionmailer (= 3.2.13)
+ actionpack (= 3.2.13)
+ activerecord (= 3.2.13)
+ activeresource (= 3.2.13)
+ activesupport (= 3.2.13)
bundler (~> 1.0)
- railties (= 3.2.11)
- railties (3.2.11)
- actionpack (= 3.2.11)
- activesupport (= 3.2.11)
+ railties (= 3.2.13)
+ railties (3.2.13)
+ actionpack (= 3.2.13)
+ activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (10.0.3)
- rdoc (3.12)
+ rake (10.0.4)
+ rb-fsevent (0.9.3)
+ rb-inotify (0.9.0)
+ ffi (>= 0.5.0)
+ rb-kqueue (0.2.0)
+ ffi (>= 0.5.0)
+ rdoc (3.12.2)
json (~> 1.4)
- redis (2.2.2)
- redis-namespace (1.1.0)
- redis (< 3.0.0)
- responders (0.9.1)
+ redis (3.0.4)
+ redis-namespace (1.3.0)
+ redis (~> 3.0.0)
+ ref (1.0.5)
+ responders (0.9.3)
railties (~> 3.1)
- rspec (2.9.0)
- rspec-core (~> 2.9.0)
- rspec-expectations (~> 2.9.0)
- rspec-mocks (~> 2.9.0)
- rspec-core (2.9.0)
- rspec-expectations (2.9.1)
- diff-lcs (~> 1.1.3)
- rspec-mocks (2.9.0)
- rspec-rails (2.9.0)
+ rspec (2.13.0)
+ rspec-core (~> 2.13.0)
+ rspec-expectations (~> 2.13.0)
+ rspec-mocks (~> 2.13.0)
+ rspec-core (2.13.1)
+ rspec-expectations (2.13.0)
+ diff-lcs (>= 1.1.3, < 2.0)
+ rspec-mocks (2.13.1)
+ rspec-rails (2.13.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec (~> 2.9.0)
- sass (3.1.15)
- sass-rails (3.2.5)
+ rspec-core (~> 2.13.0)
+ rspec-expectations (~> 2.13.0)
+ rspec-mocks (~> 2.13.0)
+ sass (3.2.9)
+ sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- shoulda-matchers (1.0.0)
- sidekiq (0.11.1)
- celluloid (~> 0.10.0)
- connection_pool (~> 0.9.0)
- multi_json
- redis
+ shoulda-matchers (2.1.0)
+ activesupport (>= 3.0.0)
+ sidekiq (2.12.0)
+ celluloid (>= 0.14.0)
+ connection_pool (>= 1.0.0)
+ json
+ redis (>= 3.0)
redis-namespace
- simple_form (2.0.1)
+ simple_form (2.1.0)
actionpack (~> 3.0)
activemodel (~> 3.0)
- sinatra (1.3.2)
- rack (~> 1.3, >= 1.3.6)
- rack-protection (~> 1.2)
+ sinatra (1.3.6)
+ rack (~> 1.4)
+ rack-protection (~> 1.3)
tilt (~> 1.3, >= 1.3.3)
- slim (1.2.0)
- temple (~> 0.4.0)
- tilt (~> 1.3.3)
+ slim (1.3.9)
+ temple (~> 0.6.3)
+ tilt (~> 1.3, >= 1.3.3)
+ slop (3.4.5)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.5)
- temple (0.4.0)
- therubyracer (0.10.2)
- libv8 (~> 3.3.10)
- thin (1.5.0)
+ sqlite3 (1.3.7)
+ temple (0.6.5)
+ therubyracer (0.11.4)
+ libv8 (~> 3.11.8.12)
+ ref
+ thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- thor (0.14.6)
- tilt (1.3.3)
+ thor (0.18.1)
+ tilt (1.4.1)
+ timers (1.1.0)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- twitter-bootstrap-rails (2.0.5)
+ twitter-bootstrap-rails (2.2.6)
actionpack (>= 3.1)
- less-rails (~> 2.2.0)
+ execjs
railties (>= 3.1)
- tzinfo (0.3.35)
- uglifier (1.2.4)
+ tzinfo (0.3.37)
+ uglifier (2.1.1)
execjs (>= 0.3.0)
- multi_json (>= 1.0.2)
- vcr (2.0.1)
- webmock (1.8.5)
+ multi_json (~> 1.0, >= 1.0.2)
+ vcr (2.5.0)
+ webmock (1.11.0)
addressable (>= 2.2.7)
- crack (>= 0.1.7)
- whenever (0.7.3)
+ crack (>= 0.3.2)
+ whenever (0.8.2)
activesupport (>= 2.3.4)
- chronic (~> 0.6.3)
+ chronic (>= 0.6.3)
yajl-ruby (1.1.0)
PLATFORMS
ruby
DEPENDENCIES
+ addressable
airbrake
ansible
capistrano (~> 2.13)
@@ -287,6 +322,7 @@ DEPENDENCIES
inherited_resources
jquery-rails
kaminari
+ less-rails-bootstrap
marked
mysql2
newrelic_rpm
@@ -302,6 +338,7 @@ DEPENDENCIES
sinatra
slim
sqlite3
+ therubyracer (= 0.11.4)
thin
twitter-bootstrap-rails
uglifier (>= 1.0.3)
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index f6a3539..0d25dcf 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -54,7 +54,7 @@
<div class="container">
- <%= render_breadcrumbs %>
+ <%# = render_breadcrumbs %>
<div class="page-header">
<h1>
diff --git a/app/views/projects/_new_github.html.erb b/app/views/projects/_new_github.html.erb
index c9569c3..7f0c46e 100644
--- a/app/views/projects/_new_github.html.erb
+++ b/app/views/projects/_new_github.html.erb
@@ -6,7 +6,7 @@
<%- if Strano.allow_organizations? -%>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Organisations... <b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Organizations... <b class="caret"></b></a>
<ul class="dropdown-menu">
<%- current_user.github.orgs.each do |org| -%>
<li><a href="#<%= org.login %>" data-toggle="tab"><%= org.login %></a></li>
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 6c23e77..27d2cf8 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -15,7 +15,7 @@ Strano::Application.configure do
config.assets.compress = true
# Don't fallback to assets pipeline if a precompiled asset is missed
- config.assets.compile = false
+ config.assets.compile = true
# Generate digests for assets URLs
config.assets.digest = true
diff --git a/db/schema.rb b/db/schema.rb
index c397647..a6dca7e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -19,8 +19,8 @@ ActiveRecord::Schema.define(:version => 20120913160334) do
t.text "results"
t.integer "project_id"
t.integer "user_id"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
t.datetime "completed_at"
t.string "stage"
t.datetime "deleted_at"
@@ -31,8 +31,8 @@ ActiveRecord::Schema.define(:version => 20120913160334) do
create_table "projects", :force => true do |t|
t.string "url"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
t.text "data"
t.datetime "cloned_at"
t.datetime "deleted_at"
@@ -46,8 +46,8 @@ ActiveRecord::Schema.define(:version => 20120913160334) do
t.string "github_access_token"
t.text "github_data"
t.boolean "ssh_key_uploaded_to_github", :default => false
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
t.datetime "deleted_at"
t.string "token"
end
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment