Merge branch 'master' into let-an-org-be-multiple-classrooms

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,16 @@
+Please choose either _issue_ or _feature request_
+
+##
+### Issue
+#### What you were trying to do ?
+_I tried to create a new assignment ..._
+
+#### What happened (include screenshot if you can) ?
+_The assignment was not created ..._
+
+#### Step-by-step reproduction instructions
+Please provide as much explanations as you can, reproduce a bug is the first step to write a fix :raised_hands:
+
+##
+### Feature request :sparkles:
+_Please provide a description of the feature you would like Classroom to have_

.gitignore

@@ -4,8 +4,9 @@
 # or operating system, you probably want to add a global ignore instead:
 #   git config --global core.excludesfile '~/.gitignore_global'
 
-# Ignore bundler config.
+# Bundler stuff
 /.bundle
+vendor/bundle
 
 # Ignore all logfiles and tempfiles.
 /log/*
@@ -42,3 +43,6 @@ spec/examples.txt
 
 # yarn
 /node_modules
+
+# mac
+.DS_Store

.node-version

@@ -0,0 +1 @@
+8.9.4

.rubocop.yml

@@ -38,6 +38,13 @@ Rails/DynamicFindBy:
   Whitelist:
     - find_by_auth_hash
 
+Rails/UnknownEnv:
+  Environments:
+    - development
+    - test
+    - staging
+    - production
+
 Style/FileName:
   Exclude:
     - 'Gemfile'

.travis.yml

@@ -23,7 +23,7 @@ cache:
   yarn: true
 
 install:
-  - bundle install --without development production --deployment --jobs=3 --retry=3
+  - bundle install --local --without development production --deployment --jobs=3 --retry=3
   - yarn install
 
 services:
@@ -32,13 +32,14 @@ services:
 
 env:
   global:
+    - CI_NODE_TOTAL=2
     - CLASSROOM_WEBHOOK_URL_PREFIX="https://example.com/github/hooks"
     - GITHUB_CLIENT_ID=client_id
     - GITHUB_CLIENT_SECRET=client_secret
     - RAILS_ENV=test
     - RACK_ENV=test
+    - REDIS_URL="redis://localhost:6379/0"
     - WEBHOOK_SECRET=abcdefg
-    - CI_NODE_TOTAL=2
   matrix:
     - CI_NODE_INDEX=0
     - CI_NODE_INDEX=1

Brewfile

@@ -1,18 +1,12 @@
 # frozen_string_literal: true
 
-# Helpers
 tap "caskroom/cask"
-tap "homebrew/versions"
 tap "github/bootstrap"
 
-cask "java8"
+cask "docker"
 cask "ngrok"
 
-brew "nodejs"
+brew "nginx", restart_service: :changed
+brew "postgresql@9.4"
 brew "terminal-notifier"
-
-brew "elasticsearch@1.7", restart_service: :changed
-brew "memcached",         restart_service: :changed
-brew "nginx",             restart_service: :changed
-brew "postgresql",        restart_service: :changed
-brew "redis",             restart_service: :changed
+brew "yarn"

CODEOWNERS

@@ -1,7 +1,7 @@
 # Code owners
 # -----------
 
-*               @tarebyte @d12
+*               @d12
 
 README.md       @mozzadrella
 ROADMAP.md      @mozzadrella

CONTRIBUTING.md

@@ -6,6 +6,8 @@
 
 Hi there! We're thrilled that you'd like to contribute to this project. Your help is essential for keeping it great.
 
+Contributions to this project are [released](https://help.github.com/articles/github-terms-of-service/#6-contributions-under-repository-license) to the public under the [project's open source license](LICENSE).
+
 ## Opening an issue
 
 Thank you for taking the time to open an issue, your feedback helps make GitHub Classroom better.

Gemfile

@@ -35,17 +35,17 @@ gem "kaminari", "~> 1.0", ">= 1.0.1"
 gem "local_time", "~> 2.0"
 
 gem "octicons_helper", "~> 2.1"
-gem "octokit",         "~> 4.7"
+gem "octokit", github: "octokit/octokit.rb", ref: "ffae5ddd6fd9da6f4538ca7adeb5d1768011610b"
 gem "omniauth",        "~> 1.6", ">= 1.6.1"
 gem "omniauth-github", "~> 1.3"
 
 gem "peek",                 "~> 1.0", ">= 1.0.1"
-gem "peek-dalli",           github: "peek/peek-dalli", ref: "0a68e1fc73095a421dc2cae3d23937bb1cbb027c"
+gem "peek-dalli",           "1.1.3.4.g0a68e1f"
 gem "peek-gc",              "~> 0.0.2"
 gem "peek-git",             "~> 1.0", ">= 1.0.2"
 gem "peek-performance_bar", "1.2"
-gem "peek-pg",              github: "mkcode/peek-pg",      ref: "9bbe212ed1b6b4a4ad56ded1ef4cf9179cdac0cd"
-gem "peek-sidekiq",         github: "Soliah/peek-sidekiq", ref: "261c857578ae6dc189506a35194785a4db51e54c"
+gem "peek-pg",              "~> 1.3"
+gem "peek-sidekiq",         "1.0.0.4.g261c857"
 gem "pg",                   "~> 0.21.0"
 gem "pry-byebug",           "~> 3.5"
 gem "pry-rails",            "~> 0.3.6"
@@ -59,9 +59,9 @@ gem "ruby-progressbar",    "~> 1.8", ">= 1.8.1", require: false
 
 gem "sass-rails", "~> 5.0", ">= 5.0.6"
 gem "sidekiq",    "~> 5.0", ">= 5.0.4"
-gem "sprockets",  "~> 3.7", ">= 3.7.1"
+gem "sprockets",  "~> 3.7", ">= 3.7.2"
 
-gem "turbolinks", github: "turbolinks/turbolinks-classic", ref: "37a7c296232d20a61bd1946f600da7f2009189db"
+gem "turbolinks", "2.5.3.226.g37a7c29"
 gem "typhoeus",   "~> 1.3"
 
 gem "uglifier", "~> 3.2"
@@ -98,10 +98,11 @@ group :production do
 end
 
 group :test do
-  gem "database_cleaner",   "~> 1.6", ">= 1.6.1"
-  gem "factory_bot_rails",  "~> 4.8"
-  gem "faker",              "~> 1.8", ">= 1.8.4"
-  gem "simplecov",          "~> 0.15.0", require: false
-  gem "vcr",                "~> 3.0", ">= 3.0.3"
-  gem "webmock",            "~> 3.0", ">= 3.0.1"
+  gem "action-cable-testing", "~> 0.3"
+  gem "database_cleaner",     "~> 1.6", ">= 1.6.1"
+  gem "factory_bot_rails",    "~> 4.8"
+  gem "faker",                "~> 1.8", ">= 1.8.4"
+  gem "simplecov",            "~> 0.15.0", require: false
+  gem "vcr",                  "~> 3.0", ">= 3.0.3"
+  gem "webmock",              "~> 3.0", ">= 3.0.1"
 end