6 commits

Author	SHA1	Message	Date
Robin Ward	007118b00c	Merge branch 'github-auth' of git://github.com/nverba/discourse ... Conflicts: config/locales/server.en.yml db/structure.sql spec/views/omniauth_callbacks/complete.html.erb_spec.rb	2013-02-27 12:09:22 -05:00
nverba	b45f872c04	Added Github authentication option, disabled by default with enable options in settings.	2013-02-26 05:00:21 +00:00
Gosha Arinich	cafc75b238	remove trailing whitespaces ❤️	2013-02-26 07:31:35 +03:00
Jesse Pollak	ad5a5b4866	This commit adds a callback route to handle omniauth failure and removes a few unneccessary entries in en.yml	2013-02-14 18:08:40 -08:00
xdite	f232c646a7	move 3 test to 1	2013-02-13 15:15:44 +08:00
Ross Kaffenberger	c959f8a67e	html safe json data for twitter/complete with view specs	2013-02-08 18:50:42 -05:00