Permalink
Commits on Apr 26, 2017
  1. Merge branch 'master' of https://github.com/otwcode/otwarchive

    zz9pzza committed Apr 26, 2017
  2. Merge branch 'AO3-4985' into 'master'

    AO3-4985 Add permission checks for marking/unmarking spam.
    
    See merge request !7
    James Beal committed Apr 26, 2017
  3. Merge branch 'AO3-4986' into 'master'

    AO3-4986 Users who aren't co-authors can edit chapters
    
    See merge request !6
    James Beal committed Apr 26, 2017
Commits on Apr 25, 2017
  1. AO3-4983 Use multiple redis servers for travis (#2878)

    * Start on travis config
    
    * Generate more config
    
    * try and run servers
    
    * try and run servers
    
    * try and run servers
    
    * Run with multiple redis servers
    
    * Fix spelling errors
    zz9pzza committed with sarken Apr 25, 2017
  2. AO3-4702 Resurrect autocomplete feature tests (#2877)

    * AO3-4702 Resurrect autocomplete feature tests
    
    * Fix indentation, use shorter scenario descriptions
    redsummernight committed with sarken Apr 25, 2017
  3. AO3-4979 Set the admin cookie for the front end (#2879)

    * Set the admin cookie for the front end
    
    * tests to check admin cookies
    
    * Follow review
    
    * indentation
    zz9pzza committed with sarken Apr 25, 2017
Commits on Apr 24, 2017
  1. Merge branch 'GitLabUpdate' into 'master'

    Gitlab update
    
    See merge request !5
    James Beal committed Apr 24, 2017
Commits on Apr 23, 2017
  1. AO3-4884 fixing exposed HTML (#2875)

    * AO3-4884 fixing exposed HTML
    
    * AO3-4884 fixing exposed HTML
    
    * AO3-4884 fixing exposed HTML
    cesy committed with sarken Apr 23, 2017
  2. AO3-4548 Ensuring that translated questions keep to themselves (#2873)

    scottsds committed with sarken Apr 23, 2017
Commits on Apr 22, 2017
  1. AO3-4548 Stolen from sarken (#2872)

    zz9pzza committed with scottsds Apr 22, 2017
  2. AO3-4957 Test for angle brackets at end of line (#2870)

    * AO3-4957 Test for angle brackets at end of line
    
    * AO3-4957 Add the space before the bracket in the test
    sarken committed with zz9pzza Apr 22, 2017
Commits on Apr 21, 2017
  1. AO3-4957 Downgrade nokogumbo to stop 502s when < is used at end of li…

    …ne (#2866)
    
    * Downgrade nokogumbo
    
    * Fix English in comment
    zz9pzza committed with sarken Apr 21, 2017
Commits on Apr 20, 2017
  1. AO3-4884 Fix exposed HTML in invitation email (#2867)

    sarken committed with zz9pzza Apr 20, 2017
Commits on Apr 16, 2017
  1. AO3-4685 Extend tests for invite_requests_controller (#2860)

    redsummernight committed with zz9pzza Apr 16, 2017
  2. AO3-4964 - Change wording on Diversity Statement (#2856)

    scottsds committed with sarken Apr 16, 2017
Commits on Apr 13, 2017
  1. AO3-4548 Allow for the reordering of FAQ Questions (#2438)

    * AO3-4548 Allow for reordering of FAQ Category Questions
    
    * AO3-4548 Allow for the reordering of FAQ Questions
    
    * AO3-4548 Allow for the reordering of FAQ Questions
    
    * AO3-4548 Allow for the reordering of FAQ Questions
    
    * AO3-4548 Fixing typo and clarifying error message
    
    * AO3-4548 Fixing a style issue, a DRY problem, and some unending p\'s
    
    * AO3-4548 Hound fixes
    
    * AO3-4548 More Hound fixes
    
    * AO3-4548 More Hound fixes
    
    * AO3-4548 Added tests for reordering of questions within a FAQ
    
    * AO3-4548 Clean up tests, add some reusable test steps
    
    * AO3-4548 And Then When I pushed to git all was well.
    
    * AO3-4548 And Then When I pushed to git all was well.
    scottsds committed with ariana-paris Apr 13, 2017
  2. AO3-4931 Add an index to TagNomination (#2812)

    * Add rspec tests for the comments controller
    
    * Add some defensive code
    
    * Fix comments_controller.rb
    
    * Add an index to tag_nominations
    zz9pzza committed with ariana-paris Apr 13, 2017
  3. AO3-4451 Error pages need to use new @media, be more responsive (#2493)

    * AO3-4451 Update stylesheets in static pages
    
    * AO3-4451 Make sure error pages have the proper inner and outer divs
    
    * AO3-4451 Put the error image below the error message
    
    * AO3-4451 Adjust error pages to display better on non-narrow screens
    
    * AO3-4451 Temporarily change stylesheets on error pages for testing
    
    * AO3-4451 Get rid of the temporary stylesheet links the lazy way
    sarken committed with ariana-paris Apr 13, 2017
  4. AO3-1744 Show error when wrangling tags into a non-canonical fandom. (#…

    …2607)
    
    * AO3-1744 Show error when wrangling tags into a non-canonical fandom.
    
    * AO3-1744 Remove redundant selves, for Hound.
    tickinginstant committed with ariana-paris Apr 13, 2017
  5. AO3-4493 Make long unsubscribe text wrap (#2633)

    * make long button text, in this case long unsubscribe text in buttons, wrap
    
    * requested changes to button styles in 03-region-header & 18-zone-searchbrowse
    pixelred committed with ariana-paris Apr 13, 2017
  6. AO3-4884 i18n invite (#2772)

    * AO3-4884 fixed by i18n of invite email
    
    * AO3-4884 missing spec
    
    * AO3-4884 extra find-replace error
    
    * AO3-4884 typo
    
    * AO3-4884 extra escaping is needed
    
    * AO3-4884 review comments
    
    * AO3-4884 adding test for missing translations
    
    * AO3-4884 make hound happy
    
    * AO3-4884 more review comments
    
    * AO3-4884 more review comments
    
    * AO3-4884 the colons are needed
    
    * AO3-4884 test failure
    
    * AO3-4884 test failure
    
    * AO3-4884 test failure
    
    * AO3-4884 test failure
    
    * AO3-4884 test failure
    cesy committed with ariana-paris Apr 13, 2017
  7. AO3-4872 Redirect and return flash message when tag set or nomination…

    …s can't be found (#2826)
    
    * AO3-4872 Redirect and return flash message when tag set or nominations can't be found
    
    * Change flash notice to error when appropriate in TagSetNominationsController
    cyrilcee committed with ariana-paris Apr 13, 2017
  8. AO3-4875 Claim external authors by id as well as email (#2752)

    * AO3-4875 Add failing tests for external author claiming
    
    * AO3-4875 Find user associated with an external author by id as well as by email
    
    * AO3-4875 Rephrase tests for less "should"
    ariana-paris committed with zz9pzza Apr 13, 2017
  9. AO3-4938 Update DMCA agent address (#2818)

    DenseLancer committed with ariana-paris Apr 13, 2017
  10. AO3-4890 Flash red error when loading nonexistent tag (#2838)

    * AO3-4890 Flash red error when loading nonexistent tag
    
    * AO3-4890 Update test for showing nonexistant tag set
    Meepu committed with ariana-paris Apr 13, 2017
  11. AO3-4968 Replace some cassettes with stubbed HTTP requests (#2852)

    Stub URLs instead of keeping cassettes when only the returned
    status code matters, as in tests on:
    
    - External bookmarks
    - External parent works
    - Importing invalid URLs
    
    Restore tests for AO3-1803 and AO3-1783.
    
    Remove after hook for resetting webmock, which is already the
    default behavior.
    redsummernight committed with zz9pzza Apr 13, 2017
  12. AO3-4967 - posting a work with ambiguous pseuds is not allowed though…

    … strong parameters (#2853)
    
    * Add ambiguous_pseuds to the strong parameters
    
    * Add test for ambiguous_pseuds
    
    * Reduce the lenght of the tests
    
    * Comment out the failing tests
    
    * Listen to the hound ( and take fix out )
    
    * Put the rest of the test in
    zz9pzza committed on GitHub Apr 13, 2017
  13. AO3-4969 Remove example_data.rb and unused files in test/ (#2854)

    Leave test/fixtures alone, which is necessary for the database
    seeding task (rake db:otwseed).
    redsummernight committed with zz9pzza Apr 13, 2017
  14. AO3-4966 Render co-author dialog when ambiguous or invalid pseuds are…

    … present (#2855)
    ariana-paris committed with zz9pzza Apr 13, 2017
Commits on Apr 9, 2017
  1. AO3-4939 Improve reliability of timestamp-related tests for tag comme…

    …nts (#2821)
    
    * Find the time machine
    
    * Try and get When/Then right
    zz9pzza committed with sarken Apr 9, 2017
  2. AO3-4926 Extend tests for inbox_controller.rb (#2839)

    * AO3-4926 Extend tests for inbox_controller.rb
    
    - Add specs for the controller.
    - Add cukes for replying to inbox comments from the home page,
      both with and without JavaScript.
    - Remove the route cancel_reply which has no action.
    
    * AO3-4926 Change some Whens to Ands
    redsummernight committed with zz9pzza Apr 9, 2017
  3. Strong parameters for BookmarkSearch. (#2849)

    tickinginstant committed with zz9pzza Apr 9, 2017
  4. Strong parameters for WorkSearch. (#2848)

    tickinginstant committed with zz9pzza Apr 9, 2017