diff --git a/Gemfile b/Gemfile index de5de462c..46a37d5d5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '4.2.5.1' +gem 'rails', '4.2.6' gem 'mysql2' gem 'sqlite3' diff --git a/Gemfile.lock b/Gemfile.lock index 8c230c428..9a7c5bc34 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,21 +1,21 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (4.2.5.1) - actionpack (= 4.2.5.1) - actionview (= 4.2.5.1) - activejob (= 4.2.5.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.5.1) - actionview (= 4.2.5.1) - activesupport (= 4.2.5.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.2) - actionview (4.2.5.1) - activesupport (= 4.2.5.1) + actionview (4.2.6) + activesupport (= 4.2.6) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) @@ -24,17 +24,17 @@ GEM actionpack (>= 4.0) activemodel (>= 4.0) railties (>= 4.0) - activejob (4.2.5.1) - activesupport (= 4.2.5.1) + activejob (4.2.6) + activesupport (= 4.2.6) globalid (>= 0.3.0) - activemodel (4.2.5.1) - activesupport (= 4.2.5.1) + activemodel (4.2.6) + activesupport (= 4.2.6) builder (~> 3.1) - activerecord (4.2.5.1) - activemodel (= 4.2.5.1) - activesupport (= 4.2.5.1) + activerecord (4.2.6) + activemodel (= 4.2.6) + activesupport (= 4.2.6) arel (~> 6.0) - activesupport (4.2.5.1) + activesupport (4.2.6) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -127,22 +127,26 @@ GEM libv8 (3.16.14.13) 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) metaclass (0.0.4) method_source (0.8.2) - mime-types (2.99.1) - mini_portile2 (2.0.0) - minitest (5.8.4) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.9.0) mocha (1.1.0) metaclass (~> 0.0.1) - multi_json (1.11.2) + multi_json (1.12.1) mysql2 (0.4.2) net-ldap (0.12.1) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) parser (2.3.0.2) ast (~> 2.2) + pkg-config (1.1.7) power_assert (0.2.6) powerpack (0.1.1) pry (0.10.3) @@ -155,16 +159,16 @@ GEM rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.5.1) - actionmailer (= 4.2.5.1) - actionpack (= 4.2.5.1) - actionview (= 4.2.5.1) - activejob (= 4.2.5.1) - activemodel (= 4.2.5.1) - activerecord (= 4.2.5.1) - activesupport (= 4.2.5.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.5.1) + railties (= 4.2.6) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -179,13 +183,13 @@ GEM ruby-graphviz (~> 1.2) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.5.1) - actionpack (= 4.2.5.1) - activesupport (= 4.2.5.1) + railties (4.2.6) + actionpack (= 4.2.6) + activesupport (= 4.2.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) - rake (10.5.0) + rake (11.2.2) rb-fsevent (0.9.6) rb-inotify (0.9.5) ffi (>= 0.5.0) @@ -286,7 +290,7 @@ DEPENDENCIES net-ldap pry pry-stack_explorer - rails (= 4.2.5.1) + rails (= 4.2.6) rails-erd rubocop rubocop-checkstyle_formatter diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index bef0e8e50..1b0736cbe 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -6,13 +6,12 @@ #= require jquery #= require jquery_ujs #= require jquery-ui +#= require clipboard.js #= require twitter/bootstrap #= require handlebars.runtime +#= require turbolinks #= require_tree ./modules #= require_tree ./templates -#= require turbolinks -#= require clipboard.js -#= require clipboard.min.js # scope for global functions diff --git a/app/assets/javascripts/modules/account.js.coffee b/app/assets/javascripts/modules/account.js.coffee index b53b52392..470a48b55 100644 --- a/app/assets/javascripts/modules/account.js.coffee +++ b/app/assets/javascripts/modules/account.js.coffee @@ -42,7 +42,7 @@ class app.Account showPassword(e) $(document).on 'click', '.clip_button', (e) -> - app.Helper.showCopyMessage(e, '.clip_button') + app.AccountHelper.showCopyMessage(e, '.clip_button') $(document).on 'click', '.result-username input', (e) -> $(this).select() diff --git a/app/assets/javascripts/modules/helper.js.coffee b/app/assets/javascripts/modules/account_helper.js.coffee similarity index 94% rename from app/assets/javascripts/modules/helper.js.coffee rename to app/assets/javascripts/modules/account_helper.js.coffee index 490d5a23a..231a117ad 100644 --- a/app/assets/javascripts/modules/helper.js.coffee +++ b/app/assets/javascripts/modules/account_helper.js.coffee @@ -1,6 +1,6 @@ app = window.App ||= {} -class app.Helper +class app.AccountHelper @showCopyMessage: (e, name) -> parent = $(e.target.closest(name)).parent() @@ -17,6 +17,3 @@ class app.Helper $(div).find($('.copied')).remove() return ), 2000 - - - new Helper diff --git a/app/assets/javascripts/modules/search.js.coffee b/app/assets/javascripts/modules/search.js.coffee index 49fa5ec75..65f9c37fb 100644 --- a/app/assets/javascripts/modules/search.js.coffee +++ b/app/assets/javascripts/modules/search.js.coffee @@ -66,6 +66,6 @@ class app.Search showPassword(e) $(document).on 'click', '.clip_button', (e) -> - app.Helper.showCopyMessage(e, '.clip_button') + app.AccountHelper.showCopyMessage(e, '.clip_button') new Search diff --git a/app/assets/javascripts/modules/team_members.js.coffee b/app/assets/javascripts/modules/team_members.js.coffee index 5a0d5e52d..a36e07a3f 100644 --- a/app/assets/javascripts/modules/team_members.js.coffee +++ b/app/assets/javascripts/modules/team_members.js.coffee @@ -90,8 +90,7 @@ class app.TeamMembers toggle_members() load_members() - $(document).on 'click', '.members li #remove_member', (e) -> + $(document).on 'click', '.members li .remove_member', (e) -> delete_member(e) new TeamMembers - diff --git a/app/assets/javascripts/templates/team_member_entry.hbs.erb b/app/assets/javascripts/templates/team_member_entry.hbs.erb index b2801964a..165461bb1 100644 --- a/app/assets/javascripts/templates/team_member_entry.hbs.erb +++ b/app/assets/javascripts/templates/team_member_entry.hbs.erb @@ -3,12 +3,12 @@
  • {{label}} {{#if admin}} - Remove + <%= image_tag("penguin.svg", class: "admin", alt:"Admin" ) %> {{/if}} {{#if deletable}} - Remove + <%= image_tag("remove.svg", class: "remove_member", alt:"Remove" ) %> {{/if}}
    • diff --git a/app/assets/stylesheets/teammember.scss b/app/assets/stylesheets/teammember.scss index d3dbe86dd..80cbafcae 100644 --- a/app/assets/stylesheets/teammember.scss +++ b/app/assets/stylesheets/teammember.scss @@ -37,6 +37,6 @@ float: right; } -li #penguin{ +li .admin{ float: right; } diff --git a/config/database.yml b/config/database.yml index c24ba1007..f0aeade71 100644 --- a/config/database.yml +++ b/config/database.yml @@ -43,12 +43,5 @@ test: database: <%= ENV['RAILS_DB_NAME'] || "#{Rails.root}/db/test.sqlite3" %> production: - database: <%= ENV['RAILS_DB_NAME'] || "cryptopus_production" %> - adapter: <%= ENV['RAILS_DB_ADAPTER'] || 'mysql2' %> - host: <%= ENV['RAILS_DB_HOST'] || '127.0.0.1' %> - port: <%= ENV['RAILS_DB_PORT'] || 3306 %> - username: <%= ENV['RAILS_DB_USERNAME'] %> - password: <%= ENV['RAILS_DB_PASSWORD'] %> - pool: 5 - timeout: 5000 - encoding: utf8 + <<: *generic + database: <%= ENV['RAILS_DB_NAME'] || "#{Rails.root}/db/development.sqlite3" %> diff --git a/config/environments/production.rb b/config/environments/production.rb index 4ab2841d3..14b3265e9 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -16,7 +16,7 @@ config.action_controller.perform_caching = true # Disable Rails's static asset server (Apache or nginx will already do this) - config.serve_static_files = false + config.serve_static_files = true # Compress JavaScripts and CSS config.assets.compress = true