Code

Brittany feature PR#30

Code

Open

brittanykohler wants to merge 47 commits intoAda-C4:masterAda-C4/typo:masterfrom brittanykohler:masterbrittanykohler/typo:masterCopy head branch name to clipboard

+319-40

Commits

Commits on Mar 28, 2016

• Setup complete

  brittanykohler

  committed
  de30c9b

  Copy full SHA for de30c9b

• Adding failing cucumber test for adding a new category

  brittanykohler

  committed
  f46a24e

  Copy full SHA for f46a24e

• Adding failing cucumber tests for editing a category

  brittanykohler

  committed
  b5ab093

  Copy full SHA for b5ab093

• Adding new view for categories

  brittanykohler

  committed
  ce8aa82

  Copy full SHA for ce8aa82

• Deleting new view, it already exists in admin folder

  brittanykohler

  committed
  671583d

  Copy full SHA for 671583d

• Changing route to hopefully fix bug

  brittanykohler

  committed
  4e637cd

  Copy full SHA for 4e637cd

• Changing route back

  brittanykohler

  committed
  72f7a01

  Copy full SHA for 72f7a01

• Adding explicit render new line to admin categories controller new method

  brittanykohler

  committed
  59508e2

  Copy full SHA for 59508e2

• Trying to edit category controller to make page render

  brittanykohler

  committed
  914c91d

  Copy full SHA for 914c91d

• Changes just to see if page will render

  brittanykohler

  committed
  d017268

  Copy full SHA for d017268

• Commenting out everything to see if new template will render

  brittanykohler

  committed
  673777f

  Copy full SHA for 673777f

• Changing back to the original code

  brittanykohler

  committed
  3b15f5d

  Copy full SHA for 3b15f5d

• Updating category controller to try to make new template render

  brittanykohler

  committed
  7269730

  Copy full SHA for 7269730

• Adding categories path for cucumber testing

  brittanykohler

  committed
  7ec37de

  Copy full SHA for 7ec37de

• Adding strong params for category

  brittanykohler

  committed
  4582b6b

  Copy full SHA for 4582b6b

• Moving where category is updated to hopefully fix bug where name is blank

  brittanykohler

  committed
  d8ae63a

  Copy full SHA for d8ae63a

• taking out strong params to see if name saving works

  brittanykohler

  committed
  f8d43ff

  Copy full SHA for f8d43ff

• Deleting code that was commented out, cucumber test passing for new categories

  brittanykohler

  committed
  d621e81

  Copy full SHA for d621e81

• Cucumber tests passing now for new/edit categories

  brittanykohler

  committed
  8bde9af

  Copy full SHA for 8bde9af

• Adding rspec test for new method in admin categories controller

  brittanykohler

  committed
  f7e334c

  Copy full SHA for f7e334c

• Delete db_development

  brittanykohler

  committed
  d1181ca

  Copy full SHA for d1181ca

• Delete db_test

  brittanykohler

  committed
  611680b

  Copy full SHA for 611680b

• Adding failing cucumber test for merge arcticles

  brittanykohler

  committed
  5afda89

  Copy full SHA for 5afda89

Commits on Mar 29, 2016

• Fixing merge conflicts

  brittanykohler

  committed
  f1ecd39

  Copy full SHA for f1ecd39

• Adding simple form for merging articles, doesn't work yet but it is on the right page

  brittanykohler

  committed
  10aff6a

  Copy full SHA for 10aff6a

• Adding condition that current user must be an admin to show merge article form

  brittanykohler

  committed
  3bbaa81

  Copy full SHA for 3bbaa81

• Adding route for article merging, nothing actually working yet

  brittanykohler

  committed
  819b250

  Copy full SHA for 819b250

• Changing merge route to include current article id

  brittanykohler

  committed
  230d252

  Copy full SHA for 230d252

• Moving merge method to admin content controller, updating route

  brittanykohler

  committed
  a126523

  Copy full SHA for a126523

• Adding passing cucumber test to ensure non-admin users cannot see merge option

  brittanykohler

  committed
  134c5e9

  Copy full SHA for 134c5e9

• Adding cucumber test for nonadmins, verifying that they can't see the merge option

  brittanykohler

  committed
  e39e94f

  Copy full SHA for e39e94f

• Adding articles for cucumber testing, writing part of merge controller method

  brittanykohler

  committed
  abb2f90

  Copy full SHA for abb2f90

• Updating edit path name to be more descriptive, changing press to follow to indicate link in admin merge cuc test

  brittanykohler

  committed
  61c53a5

  Copy full SHA for 61c53a5

• Cucumber test passing for merging article body content

  brittanykohler

  committed
  eb7ba93

  Copy full SHA for eb7ba93

• Adding code for comment merging

  brittanykohler

  committed
  d43bb41

  Copy full SHA for d43bb41

Commits on Mar 30, 2016

• Updating cucumber test for merging comments, now passing

  brittanykohler

  committed
  c45cd82

  Copy full SHA for c45cd82

• Deleting other article once article body and comments are merged

  brittanykohler

  committed
  d172b24

  Copy full SHA for d172b24

• Changing merge with field to a dropdown, need to update controller

  brittanykohler

  committed
  9586c00

  Copy full SHA for 9586c00

• Updating dropdown name so controller merge method still works

  brittanykohler

  committed
  06c4e03

  Copy full SHA for 06c4e03

• Adding test for deleting article, fixing test to select from article dropdown

  brittanykohler

  committed
  5c411f6

  Copy full SHA for 5c411f6

• Adding one test for article model merge_with method

  brittanykohler

  committed
  f857a9f

  Copy full SHA for f857a9f

• removing commented out code

  brittanykohler

  committed
  647a53f

  Copy full SHA for 647a53f

• Adding rspec test for combining article bodies in merge_with

  brittanykohler

  committed
  7d7ed76

  Copy full SHA for 7d7ed76

• Adding spec for combining comments for merge_with

  brittanykohler

  committed
  cd8c092

  Copy full SHA for cd8c092

• Adding spec for deleting other article in merge_with

  brittanykohler

  committed
  bd7c494

  Copy full SHA for bd7c494

Commits on Mar 31, 2016

• Adding error handling for when article in url does not exist in merge method

  brittanykohler

  committed
  d93cf17

  Copy full SHA for d93cf17

• Updating merge_with method to not iterate through each comment when merging comments

  brittanykohler

  committed
  29f959e

  Copy full SHA for 29f959e