Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated github references to use https instead of git #240

Merged
merged 3 commits into from
Jan 19, 2016
Merged

Updated github references to use https instead of git #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c6e996
Updated github references to use https instead of git
Dec 11, 2015
c021aa1
Needed to add gem 'rails-html-sanitizer'
Dec 14, 2015
8312772
Updated Html::WhiteListSanitizer because delayed_jobs wasn't starting
Dec 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions Gemfile
View file
Open in desktop
Expand Up @@ -8,6 +8,7 @@ gem 'audited-activerecord'
gem 'axlsx'
gem 'axlsx_rails'
gem 'bluecloth'
gem 'rails-html-sanitizer'
gem 'capistrano'
gem 'capistrano-ext'
gem 'coffee-rails'
Expand All @@ -18,7 +19,8 @@ gem 'execjs'
gem 'exception_notification'
gem 'grape', '0.7.0'
gem 'grape-entity', '~> 0.4.4'
gem 'grouped_validations', github: 'jleonardw9/grouped_validations', branch: 'master'
gem 'grouped_validations', :git => 'https://github.com/jleonardw9/grouped_validations.git', branch: 'master'
#gem 'grouped_validations', github: 'jleonardw9/grouped_validations', branch: 'master'
gem 'gyoku'
gem 'haml'
gem 'icalendar'
Expand Down Expand Up @@ -48,7 +50,8 @@ gem 'sass-rails'
gem 'savon', '~> 2.2.0'
gem 'simplecov', require: false, group: :test
gem 'sinatra'
gem 'surveyor', github: 'caboteria/surveyor', branch: 'rails4'
gem 'surveyor', :git => 'https://github.com/caboteria/surveyor.git', branch: 'rails4'
#gem 'surveyor', github: 'caboteria/surveyor', branch: 'rails4'
gem 'therubyracer', '0.10.2', :platforms => :ruby
gem 'uglifier', '>= 1.0.3'
gem 'will_paginate'
Expand Down
8 changes: 5 additions & 3 deletions Gemfile.lock
View file
Open in desktop
@@ -1,5 +1,5 @@
GIT
remote: git://github.com/caboteria/surveyor.git
remote: https://github.com/caboteria/surveyor.git
revision: 5281b317a559fba43c0a3f377dbeeaf9344ad32d
branch: rails4
specs:
Expand All @@ -14,7 +14,7 @@ GIT
uuidtools (~> 2.1)

GIT
remote: git://github.com/jleonardw9/grouped_validations.git
remote: https://github.com/jleonardw9/grouped_validations.git
revision: dc4207a7966fe691a240a47718b3d9689861a76f
branch: master
specs:
Expand Down Expand Up @@ -277,7 +277,8 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
rabl (0.11.6)
rabl (0.11.7)
activesupport (>= 2.3.14)
rack (1.6.4)
rack-accept (0.4.5)
rack (>= 0.4)
Expand Down Expand Up @@ -491,6 +492,7 @@ DEPENDENCIES
pry
rails (= 4.2.4)
rails-erd
rails-html-sanitizer
redcarpet
rest-client
rspec-activemodel-mocks
Expand Down
4 changes: 2 additions & 2 deletions app/models/cover_letter_sanitizer.rb
View file
Open in desktop
Expand Up @@ -18,6 +18,6 @@
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

class CoverLetterSanitizer < HTML::WhiteListSanitizer
self.allowed_tags = HTML::WhiteListSanitizer.allowed_tags - %w(em)
class CoverLetterSanitizer < Rails::Html::WhiteListSanitizer
self.allowed_tags = %w(p)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Robert, this doesn't have to do with switching git to https and shouldn't be in this pull request.

end