Skip to content

Commit

Permalink
Merge branch 'release/v1.2.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
odinsride committed Jun 26, 2019
2 parents 68a97f3 + f62c52c commit 19c3ed6
Show file tree
Hide file tree
Showing 50 changed files with 169 additions and 475 deletions.
39 changes: 13 additions & 26 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,22 @@
AllCops:
DisplayCopNames: true
Exclude:
- db/schema.rb
- db/**/*
- script/**/*
- bin/**/*
- tmp/**/*
- config/initializers/**/*
- config/environments/**/*
- config/application.rb
- test/**/*

Rails:
Enabled: true

Metrics:
Exclude:
- db/migrate/*.rb

Metrics/BlockLength:
Exclude:
- config/environments/*.rb
- config/initializers/simple_form_materialize.rb

# Commonly used screens these days easily fit more than 80 characters.
Metrics/LineLength:
Max: 120
Exclude:
- db/seeds.rb
- config/initializers/devise.rb
- config/initializers/simple_form_materialize.rb

# Relax the Assignment Branch Condition rule a bit
Metrics/AbcSize:
Max: 24

# Too short methods lead to extraction of single-use methods, which can make
# the code easier to read (by naming things), but can also clutter the class
Expand All @@ -32,10 +27,6 @@ Metrics/MethodLength:
Metrics/ClassLength:
Max: 1500

Rails/OutputSafety:
Exclude:
- config/initializers/simple_form_materialize/icon_component.rb

Style/Documentation:
Include:
- app/models/**/*
Expand All @@ -44,8 +35,4 @@ Style/Documentation:
# I don't see a benefit to forcing empty methods onto one line
Style/EmptyMethod:
Exclude:
- app/**/*

Style/MixinUsage:
Exclude:
- bin/**/*
- app/**/*
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased] changes

## [v1.2.3] - 2019-06-25

### Changed
- Ruby version updated to 2.6.3
- Rails version updated to 5.2.3
- Other gems updated

### Removed
- Removed Account Documents attachment type. This is not a well known or used feature, so it will be reintroduced at a later time.

## [v1.2.2] - 2019-05-19

### Fixed
Expand Down
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# frozen_string_literal: true

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.5.0'
ruby '2.6.3'

gem 'aws-sdk-s3'
gem 'coffee-rails', '~> 4.2'
Expand Down
79 changes: 51 additions & 28 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,23 @@ GEM
arel (9.0.0)
ast (2.4.0)
aws-eventstream (1.0.3)
aws-partitions (1.163.0)
aws-sdk-core (3.52.1)
aws-partitions (1.178.0)
aws-sdk-core (3.56.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.20.0)
aws-sdk-core (~> 3, >= 3.52.1)
aws-sdk-kms (1.22.0)
aws-sdk-core (~> 3, >= 3.56.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.39.0)
aws-sdk-core (~> 3, >= 3.52.1)
aws-sdk-s3 (1.43.0)
aws-sdk-core (~> 3, >= 3.56.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.0)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.0)
aws-eventstream (~> 1.0, >= 1.0.2)
backport (0.3.0)
bcrypt (3.1.12)
backport (1.1.1)
bcrypt (3.1.13)
better_errors (2.5.1)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
Expand Down Expand Up @@ -109,10 +109,16 @@ GEM
activemodel-serializers-xml (>= 1.0)
activesupport (>= 5.0)
request_store (>= 1.0)
equatable (0.6.0)
erubi (1.8.0)
execjs (2.7.0)
faker (1.9.3)
faker (1.9.4)
i18n (>= 0.7)
pastel (~> 0.7.2)
thor (~> 0.20.0)
tty-pager (~> 0.12.0)
tty-screen (~> 0.6.5)
tty-tree (~> 0.3.0)
ffi (1.9.25)
figaro (1.1.1)
thor (~> 0.14)
Expand All @@ -123,11 +129,11 @@ GEM
htmlentities (4.3.4)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.2)
jaro_winkler (1.5.3)
jbuilder (2.9.1)
activesupport (>= 4.2.0)
jmespath (1.4.0)
jquery-rails (4.3.3)
jquery-rails (4.3.5)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
Expand Down Expand Up @@ -172,8 +178,11 @@ GEM
parallel (1.17.0)
parser (2.6.3.0)
ast (~> 2.4.0)
pastel (0.7.3)
equatable (~> 0.6)
tty-color (~> 0.5)
pg (1.1.4)
public_suffix (3.0.3)
public_suffix (3.1.1)
puma (3.12.1)
rack (2.0.7)
rack-test (1.1.0)
Expand Down Expand Up @@ -211,21 +220,21 @@ GEM
ffi (~> 1.0)
request_store (1.4.1)
rack (>= 1.4)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
responders (3.0.0)
actionpack (>= 5.0)
railties (>= 5.0)
reverse_markdown (1.1.0)
nokogiri
rubocop (0.69.0)
rubocop (0.72.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
ruby-progressbar (1.10.0)
ruby-progressbar (1.10.1)
ruby_dep (1.5.0)
rubyzip (1.2.2)
rubyzip (1.2.3)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
Expand All @@ -241,14 +250,15 @@ GEM
sprockets (> 2.11)
sprockets-rails
tilt
selenium-webdriver (3.142.2)
selenium-webdriver (3.142.3)
childprocess (>= 0.5, < 2.0)
rubyzip (~> 1.2, >= 1.2.2)
simple_form (4.1.0)
actionpack (>= 5.0)
activemodel (>= 5.0)
solargraph (0.31.3)
backport (~> 0.3)
solargraph (0.34.0)
backport (~> 1.1)
bundler (>= 1.17.2)
htmlentities (~> 4.3, >= 4.3.4)
jaro_winkler (~> 1.5)
kramdown (~> 1.16)
Expand All @@ -258,8 +268,7 @@ GEM
thor (~> 0.19, >= 0.19.4)
tilt (~> 2.0)
yard (~> 0.9)
spring (2.0.2)
activesupport (>= 4.2)
spring (2.1.0)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
Expand All @@ -270,11 +279,24 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
strings (0.1.5)
strings-ansi (~> 0.1)
unicode-display_width (~> 1.5)
unicode_utils (~> 1.4)
strings-ansi (0.1.0)
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.9)
tty-color (0.5.0)
tty-pager (0.12.1)
strings (~> 0.1.4)
tty-screen (~> 0.6)
tty-which (~> 0.4)
tty-screen (0.6.5)
tty-tree (0.3.0)
tty-which (0.4.1)
turbolinks (5.2.0)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
Expand All @@ -283,11 +305,12 @@ GEM
uglifier (4.1.20)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.6.0)
unicode_utils (1.4.0)
warden (1.2.8)
rack (>= 2.0.6)
websocket-driver (0.7.0)
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
websocket-extensions (0.1.4)
will_paginate (3.1.7)
xpath (3.2.0)
nokogiri (~> 1.8)
Expand Down Expand Up @@ -333,7 +356,7 @@ DEPENDENCIES
will_paginate (~> 3.1.0)

RUBY VERSION
ruby 2.5.0p0
ruby 2.6.3p62

BUNDLED WITH
1.16.2
1.17.2
2 changes: 2 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.

Expand Down
3 changes: 0 additions & 3 deletions app/assets/javascripts/documents.coffee

This file was deleted.

2 changes: 2 additions & 0 deletions app/channels/application_cable/channel.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ApplicationCable
class Channel < ActionCable::Channel::Base
end
Expand Down
2 changes: 2 additions & 0 deletions app/channels/application_cable/connection.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ApplicationCable
class Connection < ActionCable::Connection::Base
end
Expand Down
2 changes: 2 additions & 0 deletions app/controllers/accounts_controller.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

class AccountsController < ApplicationController
before_action :authenticate_user!
before_action :set_account, only: %i[show edit update destroy activate deactivate]
Expand Down
2 changes: 2 additions & 0 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

class ApplicationController < ActionController::Base
protect_from_forgery with: :exception
before_action :set_timezone
Expand Down
85 changes: 0 additions & 85 deletions app/controllers/documents_controller.rb

This file was deleted.

Loading

0 comments on commit 19c3ed6

Please sign in to comment.