Commit ac3ef672 authored by mbajur's avatar mbajur
Browse files

Merge branch 'rubocop-tweaks' into 'dev'

First set of updates

See merge request mbajur/prismo!190
parents f2e4f766 44f405ce
Pipeline #133 passed with stage
in 7 minutes and 43 seconds
# inherit_from: .rubocop_todo.yml
AllCops:
Exclude:
- 'db/migrate/**/*'
- 'node_modules/**/*'
- 'db/seeds.rb'
Style/Documentation:
Enabled: false
Metrics/BlockLength:
Exclude:
- 'lib/tasks/**/*'
- 'spec/**/*'
Bundler/OrderedGems:
Enabled: false
# frozen_string_literal: true
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
......@@ -20,7 +22,6 @@ gem 'webpacker'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.2'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '~> 5'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.5'
......@@ -56,7 +57,7 @@ gem 'pundit'
gem 'kaminari'
gem 'closure_tree'
gem 'oj'
gem "validate_url"
gem 'validate_url'
gem 'active_link_to'
gem 'ox'
gem 'http'
......@@ -76,17 +77,14 @@ gem 'rinku'
group :development, :test do
gem 'dotenv-rails'
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
gem "bullet"
gem 'byebug', platforms: %i[mri mingw x64_mingw]
gem 'bullet'
gem 'rspec-rails', '~> 3.7'
end
group :development do
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '>= 3.0.5', '< 3.2'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'spring-commands-rspec'
......@@ -96,7 +94,7 @@ group :development do
end
group :test do
gem "factory_bot_rails", "~> 4.0"
gem 'factory_bot_rails', '~> 4.0'
gem 'simplecov', require: false
gem 'shoulda-matchers', '~> 3.1'
gem 'capybara'
......@@ -110,9 +108,8 @@ group :test do
end
group :production do
gem "aws-sdk-s3", "~> 1.2"
gem 'aws-sdk-s3', '~> 1.2'
end
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
# 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.
......
# frozen_string_literal: true
module ApplicationCable
class Channel < ActionCable::Channel::Base
end
......
# frozen_string_literal: true
module ApplicationCable
class Connection < ActionCable::Connection::Base
identified_by :current_user
......
# frozen_string_literal: true
class NotificationsChannel < ApplicationCable::Channel
def subscribed
stream_for current_user
......
# frozen_string_literal: true
class UpdatesChannel < ApplicationCable::Channel
def subscribed
stream_from 'updates_channel'
......
# frozen_string_literal: true
module Accounts
class BaseController < ApplicationController
end
......
# frozen_string_literal: true
class Accounts::CommentsController < Accounts::BaseController
layout 'application'
......
# frozen_string_literal: true
class Accounts::StoriesController < Accounts::BaseController
layout 'application'
......
# frozen_string_literal: true
class ActivityPub::Account::InboxController < ActivityPub::BaseController
include SignatureVerification
......
# frozen_string_literal: true
class ActivityPub::AccountsController < ActivityPub::BaseController
include RoutingHelper
......
# frozen_string_literal: true
class ActivityPub::BaseController < ActionController::Base
skip_before_action :verify_authenticity_token
end
# frozen_string_literal: true
module Admin
class AccountsController < BaseController
def index
......
# frozen_string_literal: true
module Admin
class BaseController < ApplicationController
before_action :authenticate_user!
......
# frozen_string_literal: true
module Admin
class DomainBlocksController < ApplicationController
layout 'settings'
......
# frozen_string_literal: true
module Admin
class FlagsController < ApplicationController
layout 'settings'
......
# frozen_string_literal: true
module Admin
class SettingsController < BaseController
ADMIN_SETTINGS = %w(
......
# frozen_string_literal: true
class Api::Ujs::AccountsController < Api::Ujs::BaseController
def toggle_follow
user_needed
......
# frozen_string_literal: true
class Api::Ujs::BaseController < ApplicationController
rescue_from Pundit::NotAuthorizedError, with: :not_authorized_error
rescue_from Prismo::Exceptions::UnauthenticatedError, with: :not_authenticated_error
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment