Permalink
Commits on Feb 22, 2013
  1. @wilkie

    Merge pull request #746 from dtykocki/master

    Fix for undefined method `start_with?' for nil:NilClass in Rakefile
    wilkie committed Feb 22, 2013
  2. @dtykocki
Commits on Feb 19, 2013
  1. @steveklabnik

    Merge pull request #745 from wilkie/bugfix/faster-tests-through-rakefile

    Bugfix/faster tests through rakefile
    steveklabnik committed Feb 19, 2013
  2. @wilkie
  3. @wilkie

    Fixes mocha deprecation warning.

    wilkie committed Feb 19, 2013
  4. @steveklabnik

    Merge pull request #742 from wilkie/bugfix/therubyracer-only-on-linux

    Bugfix/therubyracer only on linux
    steveklabnik committed Feb 19, 2013
  5. @wilkie

    Updates mocha.

    wilkie committed Feb 19, 2013
  6. @wilkie

    Updates therubyracer.

    wilkie committed Feb 19, 2013
  7. @wilkie
Commits on Feb 12, 2013
  1. @carols10cents
Commits on Jan 8, 2013
  1. @carols10cents
Commits on Dec 27, 2012
  1. @carols10cents
  2. @carols10cents

    Merge pull request #736 from imageoptimiser/optimised-images

    Optimise images (49 KB reduction)
    carols10cents committed Dec 27, 2012
  3. @carols10cents

    Merge remote-tracking branch 'origin/feature/change_username'

    Conflicts:
    	test/models/user_test.rb
    carols10cents committed Dec 27, 2012
  4. @carols10cents

    Merge remote-tracking branch 'origin/test_cleanup'

    Conflicts:
    	test/models/author_test.rb
    carols10cents committed Dec 27, 2012
  5. @carols10cents

    Merge remote-tracking branch 'origin/issue_698'

    Conflicts:
    	test/lib/converts_subscriber_to_feed_data_test.rb
    	test/lib/finds_or_creates_feeds_test.rb
    	test/lib/finger_test.rb
    carols10cents committed Dec 27, 2012
  6. @carols10cents
Commits on Dec 24, 2012
  1. @imageoptimiser @skattyadz

    Optimised images

    imageoptimiser committed with skattyadz Dec 24, 2012
Commits on Dec 10, 2012
  1. @carols10cents

    Merge pull request #734 from carols10cents/issue_733

    Issue 733
    carols10cents committed Dec 10, 2012
Commits on Dec 2, 2012
  1. @carols10cents
  2. @carols10cents

    Fixes #733. Don't allow direct posting to update create if there isn'…

    …t a valid current user.
    carols10cents committed Dec 2, 2012
Commits on Nov 26, 2012
  1. @carols10cents

    Removing an empty describe

    carols10cents committed Nov 21, 2012
  2. @carols10cents
  3. @carols10cents
  4. @carols10cents

    Organize author tests by method; group before_save callbacks together…

    …; name tests consistently
    carols10cents committed Nov 20, 2012
Commits on Nov 24, 2012
  1. @steveklabnik

    Merge pull request #732 from carols10cents/issue_731

    Fixes Issue #548 and #731. Handles cases where author is nil and that ca...
    steveklabnik committed Nov 24, 2012
  2. @carols10cents

    Fixes Issue #548 and #731. Handles cases where author is nil and that…

    … causes errors in the view.
    
    I don't know how update authors get to be nil, but here we are.
    carols10cents committed Nov 24, 2012
Commits on Nov 22, 2012
  1. @carols10cents

    Since an unsuccessful profile update shouldn't ping hubs, there's no …

    …need to use a VCR cassette in tests of unsuccessful profile updates
    carols10cents committed Nov 22, 2012
  2. @carols10cents

    Show multiple error messages when there are multiple errors saving a …

    …profile edit
    
    Reuse the errors partial from the signup process; make the message more general.
    carols10cents committed Nov 22, 2012
  3. @carols10cents
  4. @carols10cents
  5. @carols10cents
  6. @wilkie @carols10cents

    Updates name of edit profile action.

    The old name made its destructive behavior unclear and its mutation.
    This now has the common update_ prefix and a bang to indicate this. It
    is far more instructive than edit_user_profile since edit is an action
    and what is that?! It's update everywhere else! Who wrote this, an
    alien? :D :D :D
    wilkie committed with carols10cents Nov 16, 2012
  7. @wilkie @carols10cents

    Adds functionality to change your username.

    This functionality affects the User controller and model and view.
    
    In the model, I have replaced the behavior of the edit_user_profile
    badness to just add freaking errors to self whenever something is
    invalid instead of reporting a string since those errors contain
    consistent error messages anyway. It does not return. I will reflect
    this in another commit by changing the name to something more
    appropriate.
    
    Which means in the model, I have added messages to validations that for
    some reason did not have one before. We should put those strings all in
    one place eventually for sanity.
    
    In the controller, I updated the, um, update action to look for errors
    like a normal controller action would and respond naturally. Some
    wonkiness occurs.
    
    This wonkiness is a result of trying to change the field that the
    current url is built from. Therefore, let's use the canonical user,
    current_user, whenever possible. When redirecting, we have changed the
    canonical user, therefore use @user to generate urls.
    
    That wonkiness is in the view. Here, @user is the current image of the
    user and current_user is the true user (or preimage, I guess.) So, using
    current_user where (honestly, you would expect current_user anyway) you
    want to use the stable values and @user when you want the changed fields
    is what I've done.
    
    Tests:
    
    Updates tests to reflect changes in error messages.
    
    Adds four acceptance tests to edit_profile_test:
    
    * it updates your username (check that a username can simply be changed)
    * it does not update your username if the chosen username exists (make
        sure that you cannot steal somebody else's name)
    * it redirects to your new name when you change your username (the
        redirect should take you to your profile, which has a different url
        now)
    * it does not allow you to change your username to something invalid (do
        not allow special characters in your name)
    
    Adds one unit test:
    
    * username can be changed (checks that the edit_user_profile method,
        which will become update_profile! actually updates the username with
        the given parameter)
    wilkie committed with carols10cents Nov 16, 2012
  8. @wilkie @carols10cents

    Makes email duplication validation independent of username.

    Oh, and it also ignores a nil value. You have no idea how frustrating it
    was to see it take two nil values and rub them together and say "A horse
    is a horse" and throw them in my face.
    
    I also note that it was storing "" as an email sometimes, adding to the
    fun time frustration hour.
    wilkie committed with carols10cents Nov 16, 2012