Merge branch 'master' of github.com:Charcoal-SE/metasmoke

Charcoal-SE · Jun 9, 2017 · fff4088 · fff4088
2 parents c0cf059 + 126a315
commit fff4088
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
@@ -32,7 +32,7 @@
   </div>
 <% end %>
 
-<% unless current_user.oauth_created %>
+<% if current_user.oauth_created %>
   <h3>No password? No problem!</h3>
   <%= form_tag url_for(controller: '/users', action: :update_email) do %>
     <div class="field">

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -32,7 +32,7 @@
   }
 
   # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
+  # config.assets.js_compressor = :uglifier
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.