Commit Graph

68 Commits

Author SHA1 Message Date
Marcin Kulik
61b3890a3d Merge remote-tracking branch 'origin/unique-nickname'
* origin/unique-nickname:
  Keep sensitive signup data in session
  Add users factory back
  rm users factories
  Add view spec for users#new
  Add specs to user#create
  Validate nickname uniquness

Conflicts:
	Gemfile
	Gemfile.lock
2012-03-10 18:30:33 +01:00
Micha Wrobel
d6273d4259 Keep sensitive signup data in session 2012-03-10 14:58:10 +01:00
Micha Wrobel
ffb88b39ce Add users factory back 2012-03-10 14:57:53 +01:00
Micha Wrobel
43758ede64 rm users factories 2012-03-10 14:56:48 +01:00
Marcin Kulik
3f798ab7aa Check code style with cane and tailor 2012-03-08 15:00:10 +01:00
Marcin Kulik
a3d12d4a84 Fix typo in filename 2012-03-08 15:00:00 +01:00
Micha Wrobel
7a142927d3 Add view spec for users#new 2012-03-06 23:18:15 +01:00
Micha Wrobel
6b40d9dbc8 Add specs to user#create 2012-03-06 23:04:35 +01:00
Micha Wrobel
fc53b71ee2 Validate nickname uniquness 2012-03-06 22:39:16 +01:00
Marcin Kulik
9e0a6acf55 Spec for #redirect_back_or_to 2012-03-06 22:03:12 +01:00
Marcin Kulik
8216781067 Use store_location in Unauthorized handler 2012-03-06 21:29:07 +01:00
Marcin Kulik
a0041abed1 store_location / get_stored_location 2012-03-06 21:28:32 +01:00
Marcin Kulik
80df89ec84 Fix typo 2012-03-06 21:27:17 +01:00
Marcin Kulik
98d5285a23 Require auth in UserTokensController (closes #53) 2012-03-06 19:51:40 +01:00
Marcin Kulik
16d11a1249 Redirect to profile page after claiming (closes #51) 2012-03-06 19:44:27 +01:00
Marcin Kulik
11a8c66922 Remove empty helper spec files 2012-03-06 19:22:27 +01:00
Marcin Kulik
4041b31284 Update usage of FactoryGirl to new syntax 2012-03-06 19:09:15 +01:00
Marcin Kulik
51dfa8474f Profile paths: ~sickill 2012-03-04 23:07:45 +01:00
Marcin Kulik
35af4cf9e7 Home and installation pages 2012-03-04 22:44:04 +01:00
Marcin Kulik
c4f40322ed Merge branch 'master' into comments
* master:
  Display asciicast author and creation time
  Claiming asciicasts
  User#add_user_token
  Asciicast.assign_user
  User tokens for assigning asciicasts to users
  Better styles + pagination

Conflicts:
	app/models/asciicast.rb
	db/schema.rb
	spec/factories/asciicasts.rb
	spec/factories/users.rb
2012-03-04 21:14:35 +01:00
Marcin Kulik
9e59b19c16 Claiming asciicasts 2012-03-04 20:30:26 +01:00
Marcin Kulik
0de5784e68 User#add_user_token 2012-03-04 20:29:19 +01:00
Marcin Kulik
9f51211bc1 Asciicast.assign_user 2012-03-04 20:28:30 +01:00
Marcin Kulik
1ba9067551 User tokens for assigning asciicasts to users 2012-03-04 18:14:58 +01:00
Micha Wrobel
5ad02c8610 Remove wrong route 2012-03-04 16:48:24 +01:00
Micha Wrobel
5d52be2bae Add Forbiden Exception and refactor existing actions 2012-03-04 15:26:05 +01:00
Micha Wrobel
4f47f0a7fc Add specs for destroy 2012-03-04 14:37:30 +01:00
Micha Wrobel
706460e71b Show time ago in comments 2012-03-04 13:50:57 +01:00
Micha Wrobel
293e67ed86 No should in specs 2012-03-04 13:50:57 +01:00
Micha Wrobel
e7f5f57424 Some refactoring, and make possible to remove own comments 2012-03-04 13:50:56 +01:00
Micha Wrobel
9094b8b0b6 Override as_json to include more data 2012-03-04 13:50:17 +01:00
Micha Wrobel
62849d150e Make asciicast factory valid 2012-03-04 13:50:17 +01:00
Micha Wrobel
33651dbe95 Add uid sequence 2012-03-04 13:50:16 +01:00
Micha Wrobel
70cf1bdc3b Add comment resource 2012-03-04 13:50:16 +01:00
Marcin Kulik
8cbfe6844b Fix typo 2012-03-02 22:36:26 +01:00
Marcin Kulik
30f6236b79 Fix OauthHelper.get_avatar_url 2012-03-02 22:33:37 +01:00
Marcin Kulik
6eeafdf699 Extract SGR codes interpretation to separate class 2012-02-29 09:08:16 +01:00
Micha Wrobel
d4f127508f Add nickname column to users 2012-02-26 20:11:09 +01:00
Micha Wrobel
2669bbb310 Don't use assigns(:current_user) in spec 2012-02-26 20:10:09 +01:00
Micha Wrobel
96fee0c6da use get method instead delete 2012-02-26 20:09:07 +01:00
Micha Wrobel
1fbfcb2c10 Merge branch 'omniauth' of github.com:sickill/ascii.io into omniauth 2012-02-26 19:59:46 +01:00
Micha Wrobel
0768209393 Set not validated attributes to nil 2012-02-26 19:33:25 +01:00
Marcin Kulik
44c142981a Check for :alert instead of :error in spec 2012-02-26 18:40:51 +01:00
Micha Wrobel
c4763bb566 Improve controller specs, tiny refactoring 2012-02-26 18:13:46 +01:00
Micha Wrobel
0190c3f049 Add avatar_url column, modify migration file 2012-02-26 17:55:19 +01:00
Micha Wrobel
54b13fa3a6 Add OauthHelper.get_avatar_url 2012-02-26 17:45:38 +01:00
Micha Wrobel
8b07a98856 Don't use should in spec description 2012-02-26 17:39:49 +01:00
Micha Wrobel
0459877163 Refactor factory spec 2012-02-26 17:26:13 +01:00
Micha Wrobel
bf6b74289b Add omniauth authentication: github and twitter 2012-02-25 23:43:17 +01:00
Micha Wrobel
c374f43f5e fix key name, and remove unsupported email 2012-02-25 23:42:44 +01:00