This repository has been archived by the owner on May 10, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 8
lml/ost#347: Integrate unconfirm gem. #352
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,3 +17,4 @@ brakeman.html | |
cucumber_rerun.txt | ||
rspec.failures | ||
vendor/cache | ||
.sass-cache |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -333,6 +333,8 @@ | |
|
||
</div> | ||
|
||
<%= include_unconfirm %> | ||
<%= unconfirm_tag %> | ||
|
||
|
||
<%= yield :javascript %> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
category: student | ||
description: > | ||
This category contains the settings for confirmation messages | ||
when you are viewing the OST application as a student. | ||
|
||
settings: | ||
skip_answer_submitted_confirmation_dialog: | ||
description: > | ||
This setting controls if you are shown a confirmation dialog | ||
before you submit a free response or a multiple choice answer. | ||
message: > | ||
After you turn in your answer, you can no longer change it. | ||
Are you sure you want to turn in your answer? | ||
message_title: > | ||
Are you sure? | ||
dont_show_text: Don't show this message again. | ||
continue_text: Continue | ||
cancel_text: Cancel | ||
|
||
|
12 changes: 12 additions & 0 deletions
12
db/migrate/20140622221005_create_unconfirm_user_settings.unconfirm_engine.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
# This migration comes from unconfirm_engine (originally 20140613110759) | ||
class CreateUnconfirmUserSettings < ActiveRecord::Migration | ||
def change | ||
create_table(:unconfirm_user_settings) do |t| | ||
t.integer :user_id, :null => false | ||
t.text :settings | ||
t.timestamps | ||
end | ||
|
||
add_index :unconfirm_user_settings, :user_id | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Need to replace this reference to a dir on your computer with the github repo or instead publish to rubygems
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah - I was waiting to see if the gem is good enough to be published. I will change it to the github repo for now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jpslav - did you get a chance to take a look at the gem code?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did not. @Dantemss, can you take a look sometime in the coming weeks?
My inclination is to take it on faith now, subject to Kim's manual testing, and let us interact with it a bit in OST. Then when we integrate unconfirm into future products I'll definitely take a closer look.
Thanks for adding this functionality.
On Jun 27, 2014, at 8:48 PM, Lakshmi notifications@github.com wrote: