Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36 from fenprace/master 

Remove some gems in the Gemfile
This commit is contained in:
Robin Ward 2013-02-07 07:09:28 -08:00
parent f83dc09804 b60be8889f
commit 1839614bcc
4 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Gemfile
View File

@ -6,7 +6,6 @@ gem 'hiredis'
gem 'em-redis'
gem 'rails'
gem 'pg'
gem 'haml'
gem 'sass'
gem 'rake'
# errbit is broken with 3.1.3 for now
@ -20,8 +19,6 @@ gem 'nokogiri'
gem 'seed-fu'
gem 'sanitize'
gem 'slim', '<= 1.3.0'
gem 'sinatra', :require => nil
gem 'clockwork', :require => false
@ -70,11 +67,10 @@ group :assets do
gem 'uglifier'
# gem "asset_sync"
gem 'turbo-sprockets-rails3'
# need this to compile coffee on the fly
gem 'coffee-script'
end
# need this to compile coffee on the fly
gem 'coffee-script'
gem 'hpricot'
gem 'jquery-rails'
@ -97,7 +93,6 @@ group :test, :development do
gem 'guard-rspec'
gem 'guard-spork'
gem 'mocha', :require => false
gem 'test-unit', :require => "test/unit"
gem 'simplecov', :require => false
gem 'image_optim'
gem 'certified'

9
app/views/facebook/complete.html.erb Normal file
View File

@ -0,0 +1,9 @@
<html>
<head></head>
<body>
<script type="text/javascript">
window.opener.Discourse.authenticationComplete(#{@data.to_json});
window.close();
</script>
</body>
</html>

9
app/views/twitter/complete.html.erb Normal file
View File

@ -0,0 +1,9 @@
<html>
<head></head>
<body>
<script type="text/javascript">
window.opener.Discourse.authenticationComplete(#{@data.to_json});
window.close();
</script>
</body>
</html>

9
app/views/user_open_ids/complete.html.erb Normal file
View File

@ -0,0 +1,9 @@
<html>
<head></head>
<body>
<script type="text/javascript">
window.opener.Discourse.authenticationComplete(#{@data.to_json});
window.close();
</script>
</body>
</html>