Merge pull request #394 from coopdevs/develop

Release v1.6.0

.env.example

@@ -12,7 +12,6 @@
 # database setup:
 DATABASE_ADAPTER=postgres
 DATABASE_USER=postgres
-DATABASE_PASSWORD=postgres
 DATABASE_HOST=localhost
 
 # host part of the url for mail links:

.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
-sudo: false
 cache: bundler
 bundler_args: '--without production development'
 rvm:
@@ -11,3 +10,5 @@ before_script:
   - sleep 10
 services:
   - elasticsearch
+addons:
+  chrome: stable

Gemfile

@@ -23,6 +23,11 @@ gem 'prawn-table', '~> 0.2.2'
 gem 'elasticsearch-model'
 gem 'elasticsearch-rails'
 gem 'skylight'
+gem 'sidekiq', '5.1.3'
+gem 'sidekiq-cron', '0.6.3'
+# TODO: remove this once the following issue has been addressed
+#       https://github.com/ondrejbartas/sidekiq-cron/issues/199
+gem 'rufus-scheduler', '~> 3.4.2'
 
 # Assets
 gem 'jquery-rails', '>= 4.2.0'
@@ -49,17 +54,17 @@ end
 
 group :development, :test do
   gem "rspec-rails", '~> 3.7.2'
-  gem "capybara", '~> 2.4.4'
   gem "byebug"
 end
 
 group :test do
-  # Do not upgrade until
-  # https://github.com/DatabaseCleaner/database_cleaner/issues/317 is fixed
-  gem "database_cleaner", '1.3.0'
-  gem 'shoulda', ">= 3.5"
+  gem "database_cleaner", '1.6.2'
+  gem 'shoulda-matchers', '~> 3.1.2'
   gem 'fabrication'
   gem 'faker'
+  gem 'capybara', '~> 2.7'
+  gem 'capybara-selenium', '~> 0.0.6'
+  gem 'chromedriver-helper', '~> 1.0'
 end
 
 group :production do

Gemfile.lock

@@ -53,12 +53,14 @@ GEM
       sshkit (>= 1.6.1, != 1.7.0)
     arbre (1.1.1)
       activesupport (>= 3.0.0)
+    archive-zip (0.11.0)
+      io-like (~> 0.3.0)
     arel (6.0.4)
     ast (2.4.0)
     autoprefixer-rails (6.3.1)
       execjs
       json
-    bcrypt (3.1.11)
+    bcrypt (3.1.12)
     better_errors (2.4.0)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
@@ -84,12 +86,21 @@ GEM
     capistrano-rbenv (2.1.3)
       capistrano (~> 3.1)
       sshkit (~> 1.3)
-    capybara (2.4.4)
-      mime-types (>= 1.16)
+    capybara (2.18.0)
+      addressable
+      mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      xpath (~> 2.0)
+      xpath (>= 2.0, < 4.0)
+    capybara-selenium (0.0.6)
+      capybara
+      selenium-webdriver
+    childprocess (0.9.0)
+      ffi (~> 1.0, >= 1.0.11)
+    chromedriver-helper (1.2.0)
+      archive-zip (~> 0.10)
+      nokogiri (~> 1.8)
     chronic (0.10.2)
     coderay (1.1.2)
     coffee-rails (4.1.0)
@@ -101,14 +112,15 @@ GEM
     coffee-script-source (1.8.0)
     columnize (0.9.0)
     concurrent-ruby (1.0.5)
-    crass (1.0.3)
+    connection_pool (2.2.1)
+    crass (1.0.4)
     dalli (2.7.2)
-    database_cleaner (1.3.0)
+    database_cleaner (1.6.2)
     debug_inspector (0.0.3)
-    devise (4.4.1)
+    devise (4.4.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.2)
+      railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.3)
@@ -132,12 +144,15 @@ GEM
       multi_json
     erubi (1.7.1)
     erubis (2.7.0)
+    et-orbi (1.1.2)
+      tzinfo
     execjs (2.6.0)
     fabrication (2.11.3)
     faker (1.4.3)
       i18n (~> 0.5)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
+    ffi (1.9.23)
     formtastic (3.1.5)
       actionpack (>= 3.2.13)
     formtastic_i18n (0.6.0)
@@ -160,6 +175,7 @@ GEM
       has_scope (~> 0.6)
       railties (>= 4.2, <= 5.2)
       responders
+    io-like (0.3.0)
     jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -225,7 +241,9 @@ GEM
     public_suffix (2.0.5)
     pundit (0.3.0)
       activesupport (>= 3.0.0)
-    rack (1.6.9)
+    rack (1.6.10)
+    rack-protection (2.0.1)
+      rack
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.10)
@@ -262,16 +280,18 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
     raindrops (0.16.0)
-    rake (12.3.0)
+    rake (12.3.1)
     ransack (1.8.6)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
       i18n
       polyamorous (~> 1.3.2)
     rdiscount (2.1.7.1)
-    responders (2.0.2)
-      railties (>= 4.2.0.alpha, < 5)
+    redis (4.0.1)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
     rest-client (2.0.1)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
@@ -303,6 +323,9 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
+    rubyzip (1.2.1)
+    rufus-scheduler (3.4.2)
+      et-orbi (~> 1.0)
     sass (3.4.21)
     sass-rails (5.0.7)
       railties (>= 4.0.0, < 6)
@@ -312,18 +335,27 @@ GEM
       tilt (>= 1.1, < 3)
     select2-rails (4.0.1)
       thor (~> 0.14)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.2.1)
-    shoulda-matchers (2.8.0)
-      activesupport (>= 3.0.0)
+    selenium-webdriver (3.11.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.2)
+    shoulda-matchers (3.1.2)
+      activesupport (>= 4.0.0)
+    sidekiq (5.1.3)
+      concurrent-ruby (~> 1.0)
+      connection_pool (~> 2.2, >= 2.2.0)
+      rack-protection (>= 1.5.0)
+      redis (>= 3.3.5, < 5)
+    sidekiq-cron (0.6.3)
+      rufus-scheduler (>= 3.3.0)
+      sidekiq (>= 4.2.1)
     simple_form (3.1.0)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
-    skylight (1.5.0)
-      activesupport (>= 3.0.0)
-    sprockets (3.7.1)
+    skylight (2.0.1)
+      skylight-core (= 2.0.1)
+    skylight-core (2.0.1)
+      activesupport (>= 4.2.0)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -333,7 +365,7 @@ GEM
     sshkit (1.8.1)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
-    thor (0.19.4)
+    thor (0.20.0)
     thread_safe (0.3.6)
     tilt (2.0.8)
     ttfunk (1.5.1)
@@ -359,8 +391,8 @@ GEM
       sprockets-rails (>= 2.0, < 4.0)
     whenever (0.9.4)
       chronic (>= 0.6.3)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
+    xpath (3.0.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
@@ -375,10 +407,12 @@ DEPENDENCIES
   capistrano (~> 3.1)
   capistrano-rails (~> 1.1)
   capistrano-rbenv (~> 2.1)
-  capybara (~> 2.4.4)
+  capybara (~> 2.7)
+  capybara-selenium (~> 0.0.6)
+  chromedriver-helper (~> 1.0)
   coffee-rails
   dalli
-  database_cleaner (= 1.3.0)
+  database_cleaner (= 1.6.2)
   devise (~> 4.4.1)
   dotenv-rails (= 1.0.2)
   elasticsearch-model
@@ -404,9 +438,12 @@ DEPENDENCIES
   rollbar (= 2.8.3)
   rspec-rails (~> 3.7.2)
   rubocop (~> 0.52.1)
+  rufus-scheduler (~> 3.4.2)
   sass-rails (~> 5.0.7)
   select2-rails
-  shoulda (>= 3.5)
+  shoulda-matchers (~> 3.1.2)
+  sidekiq (= 5.1.3)
+  sidekiq-cron (= 0.6.3)
   simple_form (>= 3.0.0)
   skylight
   uglifier (= 2.7.2)
@@ -418,4 +455,4 @@ RUBY VERSION
    ruby 2.3.0p0
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

README.md

@@ -1,4 +1,4 @@
-# TimeOverflow [![Build Status](https://travis-ci.org/coopdevs/timeoverflow.svg)](https://travis-ci.org/coopdevs/timeoverflow) [![Code Climate](https://codeclimate.com/github/timeoverflow/timeoverflow/badges/gpa.svg)](https://codeclimate.com/github/timeoverflow/timeoverflow)
+# TimeOverflow [![View performance data on Skylight](https://badges.skylight.io/problem/grDTNuzZRnyu.svg)](https://oss.skylight.io/app/applications/grDTNuzZRnyu) [![Build Status](https://travis-ci.org/coopdevs/timeoverflow.svg)](https://travis-ci.org/coopdevs/timeoverflow) [![Code Climate](https://codeclimate.com/github/timeoverflow/timeoverflow/badges/gpa.svg)](https://codeclimate.com/github/timeoverflow/timeoverflow)
 #### www.timeoverflow.org
 
 :globe_with_meridians: Read this [in English](docs/README.en.md)

app/admin/user.rb

@@ -43,7 +43,7 @@
     end
     f.inputs "Members" do
       f.has_many :members do |m|
-        m.input :organization
+        m.input :organization, collection: Organization.order(id: :asc).pluck(:name, :id)
         m.input :manager
       end
     end

app/assets/javascripts/application.js.coffee

@@ -2,6 +2,7 @@
 #= require datepicker
 #= require give_time
 #= require tags
+#= require mobile_app_libs
 
 $(document).on 'click', 'a[data-popup]', (event) ->
   window.open($(this).attr('href'), 'popup', 'width=600,height=600')

app/assets/javascripts/mobile_app_libs.js

@@ -0,0 +1,5 @@
+// Used by the mobile app to register the device token
+// https://github.com/coopdevs/timeoverflow-mobile-app
+window.TimeOverflowRegisterExpoDeviceToken = function (token) {
+  $.post('/device_tokens', { token: token });
+}

app/assets/stylesheets/_bootstrap-custom.scss

@@ -0,0 +1,60 @@
+/*!
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
+ * Copyright 2011-2016 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ *
+ * This file lists all the available Bootstrap modules, uncomment
+ * the modules you want to import
+ */
+
+// Core variables and mixins
+@import "bootstrap-overrides";
+@import "bootstrap/variables";
+@import "bootstrap/mixins";
+
+// Reset and dependencies
+@import "bootstrap/normalize";
+@import "bootstrap/print";
+@import "bootstrap/glyphicons";
+
+// Core CSS
+@import "bootstrap/scaffolding";
+@import "bootstrap/type";
+@import "bootstrap/code";
+@import "bootstrap/grid";
+@import "bootstrap/tables";
+@import "bootstrap/forms";
+@import "bootstrap/buttons";
+
+// Components
+@import "bootstrap/component-animations";
+@import "bootstrap/dropdowns";
+@import "bootstrap/button-groups";
+@import "bootstrap/input-groups";
+@import "bootstrap/navs";
+@import "bootstrap/navbar";
+// @import "bootstrap/breadcrumbs";
+@import "bootstrap/pagination";
+@import "bootstrap/pager";
+@import "bootstrap/labels";
+@import "bootstrap/badges";
+// @import "bootstrap/jumbotron";
+// @import "bootstrap/thumbnails";
+@import "bootstrap/alerts";
+// @import "bootstrap/progress-bars";
+@import "bootstrap/media";
+@import "bootstrap/list-group";
+@import "bootstrap/panels";
+@import "bootstrap/responsive-embed";
+// @import "bootstrap/wells";
+@import "bootstrap/close";
+
+// Components w/ JavaScript
+@import "bootstrap/modals";
+@import "bootstrap/tooltip";
+// @import "bootstrap/popovers";
+// @import "bootstrap/carousel";
+
+// Utility classes
+@import "bootstrap/utilities";
+@import "bootstrap/responsive-utilities";

app/assets/stylesheets/_bootstrap-overrides.scss

@@ -0,0 +1,13 @@
+$brand-primary: $palette-turkey;
+
+$navbar-inverse-brand-hover-color: $palette-light-blue;
+$navbar-inverse-brand-color: $white;
+
+$navbar-inverse-link-color: $white;
+$navbar-inverse-link-active-color: $palette-light-blue;
+$navbar-inverse-link-active-bg: $palette-turkey;
+$navbar-inverse-link-hover-color: $palette-light-blue;
+$navbar-inverse-toggle-border-color: $white;
+$navbar-inverse-toggle-hover-bg: $palette-dark-turkey;
+
+$navbar-inverse-bg: $palette-turkey;