Skip to content
This repository has been archived by the owner on Feb 22, 2021. It is now read-only.

Launching 2.0 #104

Merged
merged 1 commit into from
Feb 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ TWILIO_SID=none
TWILIO_AUTH_TOKEN=none
TWILIO_SENDER_PHONE_NUMBER=none
SELF_HOSTED=true
LINK_TO_GITHUB_REPO=https://github.com/garrettqmartin8/volition
LINK_TO_GITHUB_REPO=https://github.com/usevolition/volition
4 changes: 4 additions & 0 deletions .erdconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
attributes:
- content
- foreign_key
- inheritance
1 change: 1 addition & 0 deletions .torus.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"org":"garrettqmartin","project":"volition"}
73 changes: 73 additions & 0 deletions CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, gender identity and expression, level of experience,
education, socio-economic status, nationality, personal appearance, race,
religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at <[email protected]>. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org
6 changes: 4 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ gem "jquery-rails"
gem "appsignal"
gem "sidekiq"
gem "normalize-rails", "~> 3.0.0"
gem "pg"
gem "pg", "0.21.0"
gem 'turbolinks'
gem "puma"
gem "rails", "~> 5.1.0"
Expand All @@ -23,7 +23,7 @@ gem "jbuilder"
gem "listen"
gem "spring"
gem 'letter_opener'
gem 'react-rails'
gem 'react-rails', "2.2.0"
gem 'bcrypt'
gem 'will_paginate', '~> 3.1.0'
gem 'twilio-ruby'
Expand All @@ -40,6 +40,8 @@ gem 'google-id-token', git: 'https://github.com/google/google-id-token.git'
gem 'enumerize'
gem "gibbon"
gem 'premailer-rails'
gem 'rails-erd'
gem "payola-payments", git: "https://github.com/payolapayments/payola.git", branch: "master"

group :development, :test do
gem "awesome_print"
Expand Down
Loading