Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: errbit/errbit
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: fireho/errbit
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
Loading
Showing 308 changed files with 4,998 additions and 4,834 deletions.
8 changes: 7 additions & 1 deletion .env.default
Original file line number Diff line number Diff line change
@@ -15,7 +15,13 @@ ERRBIT_PER_APP_EMAIL_AT_NOTICES=false
ERRBIT_NOTIFY_AT_NOTICES='[0]'
ERRBIT_PER_APP_NOTIFY_AT_NOTICES=false
MONGO_URL='mongodb://localhost'
GITHUB_URL='https://github.com'
ERRBIT_LOG_LEVEL=info
ERRBIT_LOG_LOCATION=STDOUT
GITHUB_URL=https://github.com
GITHUB_AUTHENTICATION=true
GITHUB_API_URL=https://api.github.com
GITHUB_ACCESS_SCOPE='[repo]'
GITHUB_SITE_TITLE=GitHub
DEVISE_MODULES='[database_authenticatable,recoverable,rememberable,trackable,validatable,omniauthable]'
GOOGLE_AUTHENTICATION=true
GOOGLE_SITE_TITLE=Google
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -9,15 +9,14 @@ config/deploy.rb
config/deploy
config/mongoid.yml
config/newrelic.yml
config/unicorn.rb
.rvmrc
.idea
*~
*.rbc
.DS_Store
*.rbx
bin
bundle
coverage
*#
.ruby-version
NOTES
1 change: 1 addition & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
--color
--require spec_helper
--order random
58 changes: 58 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
---
inherit_from: .rubocop_todo.yml

AllCops:
RunRailsCops: true

# Caveat: .find_by raises exception in mongoid, unlike ActiveRecord which
# returns nil
Rails/FindBy:
Enabled: false

Style/EmptyLineBetweenDefs:
AllowAdjacentOneLineDefs: true

Style/ExtraSpacing:
AllowForAlignment: true

Style/IndentationConsistency:
# `rails` style:
# prescribes that in classes and modules the `protected` and `private`
# modifier keywords shall be indented the same as public methods and that
# protected and private members shall be indented one step more than the
# modifiers.
EnforcedStyle: rails

Style/GuardClause:
MinBodyLength: 4

Style/AccessModifierIndentation:
EnforcedStyle: outdent

Style/AlignParameters:
EnforcedStyle: with_fixed_indentation

Style/DotPosition:
# Support code copy/paste into console
EnforcedStyle: trailing

Style/MultilineOperationIndentation:
EnforcedStyle: indented

Style/IndentHash:
EnforcedStyle: consistent

Style/AlignHash:
EnforcedHashRocketStyle: table
EnforcedColonStyle: table

Style/SpaceAroundOperators:
MultiSpaceAllowedForOperators:
- '='
- '=>'
- '||='
- 'then'

Style/FileName:
Exclude:
- 'config/initializers/cve-*.rb'
82 changes: 82 additions & 0 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2015-10-12 21:53:36 +0200 using RuboCop version 0.34.2.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.

# Offense count: 37
Metrics/AbcSize:
Max: 55

# Offense count: 5
# Configuration parameters: CountComments.
Metrics/ClassLength:
Max: 206

# Offense count: 5
Metrics/CyclomaticComplexity:
Max: 11

# Offense count: 457
# Configuration parameters: AllowURI, URISchemes.
Metrics/LineLength:
Max: 239

# Offense count: 29
# Configuration parameters: CountComments.
Metrics/MethodLength:
Max: 41

# Offense count: 3
Metrics/PerceivedComplexity:
Max: 12

# Offense count: 16
# Configuration parameters: Include.
Rails/Output:
Exclude:
- 'app/interactors/notice_refingerprinter.rb'
- 'app/interactors/problem_recacher.rb'
- 'db/seeds.rb'

# Offense count: 15
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/ClassAndModuleChildren:
Exclude:
- 'app/controllers/api/v1/notices_controller.rb'
- 'app/controllers/api/v1/problems_controller.rb'
- 'app/controllers/api/v1/stats_controller.rb'
- 'app/controllers/api/v3/notices_controller.rb'
- 'app/controllers/users/omniauth_callbacks_controller.rb'
- 'app/models/notification_services/campfire_service.rb'
- 'app/models/notification_services/flowdock_service.rb'
- 'app/models/notification_services/gtalk_service.rb'
- 'app/models/notification_services/hipchat_service.rb'
- 'app/models/notification_services/hoiio_service.rb'
- 'app/models/notification_services/hubot_service.rb'
- 'app/models/notification_services/pushover_service.rb'
- 'app/models/notification_services/slack_service.rb'
- 'app/models/notification_services/webhook_service.rb'
- 'config/initializers/overrides.rb'

# Offense count: 70
# Configuration parameters: Exclude.
Style/Documentation:
Enabled: false

# Offense count: 5
Style/EachWithObject:
Exclude:
- 'app/decorators/issue_tracker_type_decorator.rb'
- 'app/helpers/application_helper.rb'
- 'app/models/notice.rb'
- 'app/models/notice_fingerprinter.rb'
- 'lib/recurse.rb'

# Offense count: 873
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/StringLiterals:
Enabled: false
3 changes: 3 additions & 0 deletions .teatro.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
stage:
after_database:
- "bundle exec rails runner 'u=User.first; u.password=u.password_confirmation=\"TeatroTeatro\"; u.save!; puts \"Change admin password to: TeatroTeatro\"'"
15 changes: 11 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -2,16 +2,23 @@ language: ruby
rvm:
- 2.1
- 2.2
- 2.3.0
- rbx-2
- ruby-head
- jruby-head
env:
- RAILS_ENV=test COVERAGE=true JRUBY_OPTS=--debug
- COVERAGE=true JRUBY_OPTS=--debug
sudo: false
cache: bundler
services: mongodb
before_script: bundle exec rake errbit:bootstrap
script: bundle exec rspec
before_script:
- wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-2.6.10.tgz -O /tmp/mongodb.tgz
- tar -xvf /tmp/mongodb.tgz
- mkdir /tmp/data
- ${PWD}/mongodb-linux-x86_64-2.6.10/bin/mongod --dbpath /tmp/data --bind_ip 127.0.0.1 --auth &> /dev/null &
- bundle exec rake errbit:bootstrap
script:
- bundle exec rspec
- bundle exec rubocop --lint
matrix:
allow_failures:
- rvm: rbx-2
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 0.6.0
https://github.com/errbit/errbit/issues?utf8=%E2%9C%93&q=milestone%3A0.6.0

## 0.5.0
https://github.com/errbit/errbit/issues?utf8=%E2%9C%93&q=milestone%3A0.5.0

## 0.4.0

- #791 Fix double escaping of problem title in list view.(@felixbuenemann)
1 change: 1 addition & 0 deletions CHECKS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/users/sign_in Errbit
1 change: 1 addition & 0 deletions Capfile
Original file line number Diff line number Diff line change
@@ -4,5 +4,6 @@ require 'capistrano/deploy'
require 'capistrano/rbenv' if ENV['rbenv']
require 'capistrano/bundler'
require 'capistrano/rails/assets'
require 'capistrano/puma'

Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
55 changes: 29 additions & 26 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,45 +1,46 @@
source 'https://rubygems.org'

RAILS_VERSION = '~> 4.1.8'
RAILS_VERSION = '~> 4.2.5.2'

send :ruby, ENV['GEMFILE_RUBY_VERSION'] if ENV['GEMFILE_RUBY_VERSION']

gem 'actionmailer', RAILS_VERSION
gem 'actionpack', RAILS_VERSION
gem 'railties', RAILS_VERSION

gem 'moped', '~> 2.0.2'
gem 'mongoid', '~> 4.0.0'

gem 'mongoid_rails_migrations'
gem 'devise'
gem 'actionmailer_inline_css'
gem 'decent_exposure'
gem 'devise', '~> 3.5.5'
gem 'dotenv-rails'
gem 'draper'
gem 'errbit_plugin'
gem 'errbit_github_plugin'
gem 'font-awesome-rails'
gem 'haml'
gem 'htmlentities'
gem 'rack-ssl', :require => 'rack/ssl' # force SSL

gem 'useragent'
gem 'decent_exposure'
gem 'actionmailer_inline_css'
gem 'kaminari', '>= 0.14.1'
gem 'rack-ssl-enforcer', :require => false
gem 'kaminari', '>= 0.16.3'
gem 'mongoid', '5.0.2'
gem 'mongoid_rails_migrations'
gem 'rack-ssl', require: 'rack/ssl' # force SSL
gem 'rack-ssl-enforcer', require: false
gem 'rails_autolink'
gem 'useragent'

# Please don't update hoptoad_notifier to airbrake.
# It's for internal use only, and we monkeypatch certain methods
gem 'hoptoad_notifier', "~> 2.4"
gem 'draper'

gem 'errbit_plugin'
gem 'errbit_github_plugin'
#gem 'errbit_gitlab_plugin'

gem 'dotenv-rails'
gem 'errbit_gitlab_plugin'

# Notification services
# ---------------------------------------
gem 'campy'
# Hipchat
gem 'hipchat'
# Google Talk
gem 'xmpp4r', :require => ["xmpp4r", "xmpp4r/muc"]
gem 'xmpp4r', require: ["xmpp4r", "xmpp4r/muc"]
# Hoiio (SMS)
gem 'hoi'
# Pushover (iOS Push notifications)
@@ -53,23 +54,27 @@ gem 'flowdock'
# ---------------------------------------
# GitHub OAuth
gem 'omniauth-github'
# Google OAuth
gem 'omniauth-google-oauth2'

gem 'ri_cal'
gem 'yajl-ruby', platform: 'ruby'
gem 'json', platform: 'jruby'

group :development, :test do
gem 'airbrake', :require => false
gem 'airbrake', '~> 4.3.5', require: false
gem 'pry-rails'
gem 'pry-byebug', platforms: [:mri]
gem 'quiet_assets'
gem 'rubocop', require: false
end

group :development do
gem 'capistrano', require: false
gem 'capistrano-bundler', require: false
gem 'capistrano-rails', require: false
gem 'capistrano-rbenv', require: false
gem 'capistrano3-puma', require: false

# better errors
gem 'better_errors'
@@ -78,30 +83,28 @@ group :development do
end

group :test do
gem 'rspec'
gem 'rspec', '~> 3.3'
gem 'rspec-rails', '~> 3.0', require: false
gem 'rspec-activemodel-mocks'
gem 'rspec-its'
gem 'mongoid-rspec', require: false
gem 'mongoid-rspec', '~> 3.0.0', require: false
gem 'fabrication'
gem 'capybara'
gem 'poltergeist'
gem 'launchy'
gem 'database_cleaner'
gem 'email_spec'
gem 'timecop'
gem 'test-unit', require: 'test/unit'
gem 'coveralls', require: false
end

group :heroku, :production do
gem 'rails_12factor', require: !!ENV["HEROKU"]
gem 'rails_12factor', require: ENV.key?("HEROKU")
gem 'unicorn', require: false, platform: 'ruby'
gem 'unicorn-worker-killer'
end

gem 'therubyracer', :platform => :ruby # C Ruby (MRI) or Rubinius, but NOT Windows
gem 'therubyracer', platform: :ruby # C Ruby (MRI) or Rubinius, but NOT Windows
gem 'sass-rails'
gem 'coffee-rails'
gem 'uglifier'
# We can't upgrade because not compatible to jquery >= 1.9.
# To do that, we need fix the rails.js
Loading