Skip to content
Permalink
Browse files

Merge branch 'develop/accountancy-2018' into master

  • Loading branch information...
Aquaj committed Apr 10, 2019
2 parents 53a1f02 + 3cbfbf6 commit 6e908622879eef74974711b760a4d7a77a4b5b7f
Showing 970 changed files with 21,190 additions and 24,707 deletions.
@@ -89,3 +89,4 @@ Procfile.*
.gitconfig

.DS_Store

@@ -1,16 +1,22 @@
language: ruby
bundler_args: "--full-index --without development"
# cache: bundler
cache: bundler
sudo: required

rvm:
- 2.3.4
- 2.3.8
- 2.6.2
env:
- NAME=Main TASK='test:fast'
- NAME=Long TASK='test:slow'
#name: $NAME test suite
script: travis_wait 60 xvfb-run bundle exec rake ${TASK} DRIVER=webkit

before_install: test/ci/before_install
before_script: test/ci/before_script
script: travis_wait 60 xvfb-run bundle exec rake test:models test:libs test:controllers DRIVER=webkit
services:
- redis-server
notifications:
webhooks: https://coveralls.io/webhook?repo_token=COVERALLS_REPO_TOKEN
email: false
slack:
secure: v1/ya/fyroy3BmW9FDMmKi3lwamnzY6ktQAU/vEJCg4AgvauY0QJthMsLXOBb3RnhFWao2Kj2H40XjI7VtH3z46VEq6DPLURBqmAc24c30ZMi/XIM9YqauYeEPHPhM0nDQY+s0ovU2uX/1w7uv/atNjy0n643An61Em+qPwIW5U=
30 Gemfile
@@ -1,5 +1,10 @@
source 'https://rubygems.org'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
"https://github.com/#{repo_name}.git"
end

ruby '>= 2.3.3', '< 3.0.0'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
@@ -13,7 +18,7 @@ gem 'activerecord-postgis-adapter', '>= 3.0.0'
gem 'pg', '~> 0.20.0' # Needed for some tasks

# Multi-tenancy
gem 'apartment', github:'influitive/apartment', branch: 'development'
gem 'apartment', github: 'influitive/apartment', branch: 'development'
gem 'apartment-sidekiq'

# Ruby syntax extensions
@@ -34,7 +39,7 @@ gem 'figaro'
gem 'turnout'

# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
gem 'sassc-rails'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
@@ -58,10 +63,11 @@ gem 'turbolinks', '~> 2.0'
# jQuery UI Javascript framework
gem 'jquery-ui-rails'
# gem 'jquery_mobile_rails'
gem 'bootstrap3-datetimepicker-rails'
gem 'jquery-scrollto-rails'
gem 'momentjs-rails', '>= 2.9.0'

gem 'flatpickr', '~> 4.5', '>= 4.5.2.0'

# Forms helper
gem 'formize', '~> 2.1.0'
# gem 'codemirror-rails'
@@ -100,7 +106,7 @@ gem 'unicorn', group: :production
gem 'exception_notification'

# Views helpers
gem 'active_list', '>= 6.9.3' # , path: "../active_list"
gem 'active_list', github: 'ekylibre/active_list'
gem 'haml'
gem 'simple_calendar'

@@ -168,6 +174,7 @@ gem 'roo'
gem 'rubyzip', '~> 1.2.2'
gem 'sepa_king'
# gem 'sepa_king', path: '/home/jonathan/Workspace/sepa_king'
gem 'odf-report'
gem 'rodf'

# Demo data
@@ -184,7 +191,7 @@ gem 'bootstrap-sass', '~> 3.4.1'
gem 'twitter-typeahead-rails'

# Iconic font
gem 'agric', '~> 3.0'
gem 'agric', github: 'ekylibre/agric', tag: 'v3.0.2'

# Web services
gem 'mechanize'
@@ -197,6 +204,8 @@ gem 'luhn'
# For interval selector
gem 'bootstrap-slider-rails'

gem 'gpgme'

group :development do
gem 'bullet', '< 5.6.0'

@@ -206,6 +215,8 @@ group :development do
# Get the time of a process
gem 'ruby-prof'

gem 'better_errors'

# Code metrics
gem 'rails_best_practices', require: false
gem 'rubocop', '~> 0.49.1', require: false
@@ -242,14 +253,11 @@ group :test do
gem 'capybara-webkit', '>= 1.14.0'
gem 'selenium-webdriver'

gem 'codacy-coverage', require: false
gem 'codecov', require: false
gem 'database_cleaner'
gem 'simplecov', require: false

gem 'minitest-reporters'

gem 'factory_bot'
gem 'pdf-reader'

gem 'factory_bot', '< 5'
end

# Load Gemfile.local, Gemfile.plugins, plugins', and custom Gemfiles
Oops, something went wrong.

0 comments on commit 6e90862

Please sign in to comment.
You can’t perform that action at this time.