Code

Create Merge Feature#34

Code

Open

jbuechs wants to merge 38 commits intoAda-C4:masterAda-C4/typo:masterfrom jbuechs:masterjbuechs/typo:masterCopy head branch name to clipboard

+286-10

Commits

Commits on Mar 28, 2016

• complete setup

  jbuechs

  committed
  ea8b763

• add better errors

  jbuechs

  committed
  22db627

• add pry

  jbuechs

  committed
  87a2f98

• create stubs for adding and editing category features

  jbuechs

  committed
  4ebdd0c

• check for id in params to determine whether new or editing category

  jbuechs

  committed
  96056fa

• bugfix for empty category name

  jbuechs

  committed
  f58f517

• update dbs

  jbuechs

  committed
  e8c3f91

• add tests for new category

  jbuechs

  committed
  75a3724

• create cucumber tests for creating a category

  jbuechs

  committed
  6261cd6

• create feature tests for category

  jbuechs

  committed
  77c2ebb

• create tests for valid and invalid updating of category

  jbuechs

  committed
  657c1a4

• spec/controllers/accounts_controller_spec.rb

  jbuechs

  committed
  42e9c93

• add update category tests to cucumber

  jbuechs

  committed
  b28f533

• add update category tests to cucumber

  jbuechs

  committed
  93c5397

• update dbs

  jbuechs

  committed
  09f2a3c

• remove db files from commit

  jbuechs

  committed
  c9adfa0

• remove pry

  jbuechs

  committed
  e37d605

• change test description for clarity

  jbuechs

  committed
  8018e78

Commits on Mar 29, 2016

• create test for adding merge to new article form

  jbuechs

  committed
  79615d1

• add test that contributor does not see merge form

  jbuechs

  committed
  abf1587

• showing merge form for admin

  jbuechs

  committed
  e0229ec

• create test for merging text

  jbuechs

  committed
  4517eb7

• format tables

  jbuechs

  committed
  1edbaaa

• separate article_merge tests into admin and not admin

  jbuechs

  committed
  08dec6a

• update admin features to not show merge on new page

  jbuechs

  committed
  8c73be9

• complete tests for merging text of two articles

  jbuechs

  committed
  310076a

• implement feature for merging text of two articles

  jbuechs

  committed
  0f506a4

Commits on Mar 31, 2016

• create test for merging comments

  jbuechs

  committed
  11791a6

• merge comments

  jbuechs

  committed
  9a8c0a0

• create test for deleting merged article

  jbuechs

  committed
  d659aa6

• delete merged article

  jbuechs

  committed
  4a26383

• delete merged article

  jbuechs

  committed
  0f6e8e5

• Merge branch 'master' of github.com:jbuechs/typo

  jbuechs

  committed
  95942e1

• remove pry and rename variable to be more meaningful

  jbuechs

  committed
  38b7ee5

Commits on Apr 1, 2016

• move merge function to model and create transaction

  jbuechs

  committed
  85b115d

• add db file to gitignore

  jbuechs

  committed
  b5d8a96

• only query all articles when admin and editing

  jbuechs

  committed
  c0acb92

• refactor merging comments

  jbuechs

  committed
  89ecebe