Skip to content

Commit 6e90862

Browse files
authored
Merge branch 'develop/accountancy-2018' into master
2 parents 53a1f02 + 3cbfbf6 commit 6e90862

File tree

970 files changed

+21190
-24707
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

970 files changed

+21190
-24707
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,4 @@ Procfile.*
8989
.gitconfig
9090

9191
.DS_Store
92+

.travis.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
language: ruby
22
bundler_args: "--full-index --without development"
3-
# cache: bundler
3+
cache: bundler
44
sudo: required
5+
56
rvm:
6-
- 2.3.4
7+
- 2.3.8
8+
- 2.6.2
9+
env:
10+
- NAME=Main TASK='test:fast'
11+
- NAME=Long TASK='test:slow'
12+
#name: $NAME test suite
13+
script: travis_wait 60 xvfb-run bundle exec rake ${TASK} DRIVER=webkit
14+
715
before_install: test/ci/before_install
816
before_script: test/ci/before_script
9-
script: travis_wait 60 xvfb-run bundle exec rake test:models test:libs test:controllers DRIVER=webkit
1017
services:
1118
- redis-server
1219
notifications:
13-
webhooks: https://coveralls.io/webhook?repo_token=COVERALLS_REPO_TOKEN
1420
email: false
1521
slack:
1622
secure: v1/ya/fyroy3BmW9FDMmKi3lwamnzY6ktQAU/vEJCg4AgvauY0QJthMsLXOBb3RnhFWao2Kj2H40XjI7VtH3z46VEq6DPLURBqmAc24c30ZMi/XIM9YqauYeEPHPhM0nDQY+s0ovU2uX/1w7uv/atNjy0n643An61Em+qPwIW5U=

Gemfile

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
source 'https://rubygems.org'
22

3+
git_source(:github) do |repo_name|
4+
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
5+
"https://github.com/#{repo_name}.git"
6+
end
7+
38
ruby '>= 2.3.3', '< 3.0.0'
49

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

1520
# Multi-tenancy
16-
gem 'apartment', github:'influitive/apartment', branch: 'development'
21+
gem 'apartment', github: 'influitive/apartment', branch: 'development'
1722
gem 'apartment-sidekiq'
1823

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

3641
# Use SCSS for stylesheets
37-
gem 'sass-rails', '~> 5.0'
42+
gem 'sassc-rails'
3843
# Use Uglifier as compressor for JavaScript assets
3944
gem 'uglifier', '>= 1.3.0'
4045
# Use CoffeeScript for .coffee assets and views
@@ -58,10 +63,11 @@ gem 'turbolinks', '~> 2.0'
5863
# jQuery UI Javascript framework
5964
gem 'jquery-ui-rails'
6065
# gem 'jquery_mobile_rails'
61-
gem 'bootstrap3-datetimepicker-rails'
6266
gem 'jquery-scrollto-rails'
6367
gem 'momentjs-rails', '>= 2.9.0'
6468

69+
gem 'flatpickr', '~> 4.5', '>= 4.5.2.0'
70+
6571
# Forms helper
6672
gem 'formize', '~> 2.1.0'
6773
# gem 'codemirror-rails'
@@ -100,7 +106,7 @@ gem 'unicorn', group: :production
100106
gem 'exception_notification'
101107

102108
# Views helpers
103-
gem 'active_list', '>= 6.9.3' # , path: "../active_list"
109+
gem 'active_list', github: 'ekylibre/active_list'
104110
gem 'haml'
105111
gem 'simple_calendar'
106112

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

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

186193
# Iconic font
187-
gem 'agric', '~> 3.0'
194+
gem 'agric', github: 'ekylibre/agric', tag: 'v3.0.2'
188195

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

207+
gem 'gpgme'
208+
200209
group :development do
201210
gem 'bullet', '< 5.6.0'
202211

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

218+
gem 'better_errors'
219+
209220
# Code metrics
210221
gem 'rails_best_practices', require: false
211222
gem 'rubocop', '~> 0.49.1', require: false
@@ -242,14 +253,11 @@ group :test do
242253
gem 'capybara-webkit', '>= 1.14.0'
243254
gem 'selenium-webdriver'
244255

245-
gem 'codacy-coverage', require: false
246-
gem 'codecov', require: false
247-
gem 'database_cleaner'
248-
gem 'simplecov', require: false
249-
250256
gem 'minitest-reporters'
251257

252-
gem 'factory_bot'
258+
gem 'pdf-reader'
259+
260+
gem 'factory_bot', '< 5'
253261
end
254262

255263
# Load Gemfile.local, Gemfile.plugins, plugins', and custom Gemfiles

0 commit comments

Comments
 (0)