removed ad sense

.gitignore

@@ -17,3 +17,4 @@ db/cstore
 config/initializers/jerks.rb
 .ruby-gemset
 .ruby-version
+.DS_Store

Gemfile

@@ -1,19 +1,19 @@
 source 'http://rubygems.org'
 
-ruby '2.2.2'
+ruby '2.3.1'
 
 gem 'rails', '~> 4.2.1'
 gem 'mysql2', '~> 0.3.0'
 gem 'sanitize', '~> 3.0.0'
 gem 'csspool', '~> 4.0.5'
-gem 'public_suffix', '~> 1.3.1'
+gem 'public_suffix'
 gem 'thinking-sphinx', '~> 3.1.3'
 gem 'riddle', '~> 1.5.11'
 gem 'ts-delayed-delta', '~> 2.0.2'
 gem 'delayed_job', '~> 4.0.6'
 gem 'delayed_job_active_record', '~> 4.0.3'
 gem 'will_paginate', '~> 3.0.5'
-gem 'ruby-openid', '~> 2.3.0'
+gem 'ruby-openid', '~> 2.7.0'
 gem 'strip_attributes', '~> 1.5.0'
 gem 'dynamic_form', '~> 1.1.4'
 gem 'dalli', '~> 2.6.4'
@@ -30,3 +30,9 @@ gem 'coffee-rails'
 gem 'therubyracer'
 gem 'yui-compressor'
 gem 'faker'
+gem 'addressable'
+
+group :development do
+	gem 'better_errors'
+	gem 'binding_of_caller'
+end

Gemfile.lock

@@ -1,94 +1,105 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
+    actionmailer (4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.1)
-      actionview (= 4.2.1)
-      activesupport (= 4.2.1)
+    actionpack (4.2.6)
+      actionview (= 4.2.6)
+      activesupport (= 4.2.6)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.6)
+      activesupport (= 4.2.6)
       globalid (>= 0.3.0)
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
       arel (~> 6.0)
-    activesupport (4.2.1)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.0)
+    addressable (2.4.0)
+    arel (6.0.3)
+    better_errors (2.1.1)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
+      rack (>= 0.9.0)
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
     builder (3.2.2)
-    coffee-rails (4.0.1)
+    coderay (1.1.1)
+    coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
+      railties (>= 4.0.0, < 5.1.x)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
+    coffee-script-source (1.10.0)
+    concurrent-ruby (1.0.2)
     crass (0.2.1)
     csspool (4.0.5)
-    daemons (1.1.9)
+    daemons (1.2.3)
     dalli (2.6.4)
+    debug_inspector (0.0.2)
     delayed_job (4.0.6)
       activesupport (>= 3.0, < 5.0)
     delayed_job_active_record (4.0.3)
       activerecord (>= 3.0, < 5.0)
       delayed_job (>= 3.0, < 4.1)
     dynamic_form (1.1.4)
     erubis (2.7.0)
-    execjs (2.2.1)
-    faker (1.4.3)
+    execjs (2.6.0)
+    faker (1.6.3)
       i18n (~> 0.5)
-    faraday (0.9.0)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    globalid (0.3.5)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
-    hashie (3.3.1)
-    hike (1.2.3)
+    hashie (3.4.4)
     i18n (0.7.0)
     ignorable (0.2.0)
       activerecord (>= 3)
     innertube (1.1.0)
     joiner (0.3.4)
       activerecord (>= 4.1.0)
-    json (1.8.2)
-    jwt (1.0.0)
-    libv8 (3.16.14.7)
-    loofah (2.0.1)
+    json (1.8.3)
+    jwt (1.5.4)
+    libv8 (3.16.14.15)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     middleware (0.1.0)
-    mime-types (2.5)
-    mini_portile (0.6.0)
-    minitest (5.6.1)
-    multi_json (1.11.0)
+    mime-types (3.0)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0221)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
+    multi_json (1.12.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    mysql2 (0.3.16)
-    newrelic_rpm (3.9.4.245)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    mysql2 (0.3.21)
+    newrelic_rpm (3.15.2.317)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
     nokogumbo (1.1.12)
       nokogiri
     oauth2 (1.0.0)
@@ -97,76 +108,75 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    omniauth (1.2.2)
+    omniauth (1.3.1)
       hashie (>= 1.2, < 4)
-      rack (~> 1.0)
-    omniauth-google-oauth2 (0.2.5)
-      omniauth (> 1.0)
-      omniauth-oauth2 (~> 1.1)
-    omniauth-oauth2 (1.2.0)
-      faraday (>= 0.8, < 0.10)
+      rack (>= 1.0, < 3)
+    omniauth-google-oauth2 (0.4.1)
+      jwt (~> 1.5.2)
       multi_json (~> 1.3)
+      omniauth (>= 1.1.1)
+      omniauth-oauth2 (>= 1.3.1)
+    omniauth-oauth2 (1.4.0)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
-    public_suffix (1.3.3)
-    rack (1.6.0)
+    public_suffix (1.5.3)
+    rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.1)
-      actionmailer (= 4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
-      activemodel (= 4.2.1)
-      activerecord (= 4.2.1)
-      activesupport (= 4.2.1)
+    rails (4.2.6)
+      actionmailer (= 4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      activemodel (= 4.2.6)
+      activerecord (= 4.2.6)
+      activesupport (= 4.2.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.1)
+      railties (= 4.2.6)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
-    railties (4.2.1)
-      actionpack (= 4.2.1)
-      activesupport (= 4.2.1)
+    railties (4.2.6)
+      actionpack (= 4.2.6)
+      activesupport (= 4.2.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    ref (1.0.5)
-    riddle (1.5.11)
-    ruby-openid (2.3.0)
-    sanitize (3.0.2)
+    rake (11.1.2)
+    ref (2.0.0)
+    riddle (1.5.12)
+    ruby-openid (2.7.0)
+    sanitize (3.0.4)
       crass (~> 0.2.0)
       nokogiri (>= 1.4.4)
       nokogumbo (= 1.1.12)
-    sass (3.2.19)
-    sass-rails (4.0.3)
+    sass (3.4.22)
+    sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.0)
-      sprockets (~> 2.8, <= 2.11.0)
-      sprockets-rails (~> 2.0)
-    sprockets (2.11.0)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
+      sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+    sprockets (3.6.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.0.4)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     strip_attributes (1.5.1)
       activemodel (>= 3.0, < 5.0)
-    therubyracer (0.12.1)
+    therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
-    thinking-sphinx (3.1.3)
+    thinking-sphinx (3.1.4)
       activerecord (>= 3.1.0)
       builder (>= 2.1.2)
       innertube (>= 1.0.2)
@@ -175,22 +185,24 @@ GEM
       riddle (>= 1.5.11)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (1.4.1)
+    tilt (2.0.2)
     ts-delayed-delta (2.0.2)
       delayed_job
       thinking-sphinx (>= 1.5.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.5.3)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
+    uglifier (3.0.0)
+      execjs (>= 0.3.0, < 3)
     will_paginate (3.0.7)
     yui-compressor (0.12.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  addressable
+  better_errors
+  binding_of_caller
   coffee-rails
   csspool (~> 4.0.5)
   daemons
@@ -204,11 +216,11 @@ DEPENDENCIES
   newrelic_rpm
   omniauth
   omniauth-google-oauth2
-  public_suffix (~> 1.3.1)
+  public_suffix
   rails (~> 4.2.1)
   rails-observers (~> 0.1.2)
   riddle (~> 1.5.11)
-  ruby-openid (~> 2.3.0)
+  ruby-openid (~> 2.7.0)
   sanitize (~> 3.0.0)
   sass-rails
   strip_attributes (~> 1.5.0)
@@ -218,3 +230,9 @@ DEPENDENCIES
   uglifier
   will_paginate (~> 3.0.5)
   yui-compressor
+
+RUBY VERSION
+   ruby 2.3.1p112
+
+BUNDLED WITH
+   1.12.3

app/assets/javascripts/install.js

@@ -226,9 +226,14 @@ function fireCustomEvent(name) {
 
 var stylishActivatedPanel = null;
 function switchToPanel(panelId) {
+	var newPanel = document.getElementById(panelId);
+	if (!newPanel) {
+		return false;
+	}
 	document.getElementById(currentPanel).style.display = "none";
-	document.getElementById(panelId).style.display = "";
+	newPanel.style.display = "";
 	currentPanel = panelId;
+	return true;
 }
 
 function switchBrowserValue(value) {
@@ -362,8 +367,10 @@ function styleCanBeInstalledOpera(event) {
 	genericStyleCanBeInstalled("stylish-installed-style-not-installed-opera");
 }
 function genericStyleCanBeInstalled(panel) {
-	switchToPanel(panel);
-	stylishActivatedPanel = panel;
+	// Stylish can fire this even when we're not a style page, so guard for that.
+	if (switchToPanel(panel)) {
+		stylishActivatedPanel = panel;
+	}
 }
 
 function styleAlreadyInstalled(event) {