Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit aa6654a

Browse files
committedMay 27, 2016
Merge master
2 parents 0f2234f + 9d777a7 commit aa6654a

File tree

189 files changed

+287
-196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+287
-196
lines changed
 

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ notifications:
2222
email: false
2323

2424
env:
25-
- GITHUB_CLIENT_ID=client_id
25+
- GITHUB_CLIENT_ID=client_id GITHUB_CLIENT_SECRET=client_secret

‎app/controllers/application_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def current_scopes
2828
end
2929

3030
def required_scopes
31-
%w(user:email repo delete_repo admin:org)
31+
Classroom::Scopes::TEACHER
3232
end
3333

3434
def adequate_scopes?

0 commit comments

Comments
 (0)
Please sign in to comment.