delta/gitlab/gitlab-ce.git/spec/factories, branch diff-notes-refactor

Merge branch '26705-filter-todos-by-manual-add' into 'master'

2017-02-08T13:32:55+00:00

Filter todos by manual add

Closes #26705

See merge request !8861

Use normal associations instead of polymorphic.

2017-02-07T15:41:44+00:00

We can't properly use foreign keys on columns that are configured for
polymorphic associations which has disadvantages related to data
integrity and storage. Given we only use time tracking for Issues and
Merge Requests we're moving to the usage of regular associations.

Merge branch 'jej-pages-to-ce' into 'master'

2017-02-06T18:20:38+00:00


Adding GitLab Pages to CE

Closes #14605, gitlab-com/infrastructure#1058, gitlab-ee#1333, and #323

See merge request !8463

Merge branch 'master' into 'jej-pages-to-ce'

2017-02-06T15:12:27+00:00

# Conflicts:
#   db/schema.rb

Add traits for ProjectFeatures to Project factory

2017-02-05T08:11:45+00:00

https://gitlab.com/gitlab-org/gitlab-ce/issues/24007

Merge branch 'rs-event-traits' into 'master'

2017-02-03T18:44:06+00:00


Add traits for the different Event types to the Event factory

See merge request !8870

Merge branch 'master' into jej-pages-picked-from-ee

2017-02-03T17:25:26+00:00

Remove backlog lists from factories

2017-02-03T14:02:43+00:00

Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creating-file

2017-02-02T03:54:35+00:00

* upstream/master: (190 commits)
  Remove unnecessary returns / unset variables from the CoffeeScript -> JS conversion.
  update spec
  Change the reply shortcut to focus the field even without a selection.
  use destroy_all
  Remove settings cog from within admin scroll tabs; keep links centered
  add changelog
  remove old project members from project
  add spec replicating validation error
  Fix small typo on new branch button spec
  Improve styling of the new issue message
  Don't capitalize environment name in show page
  Abillity to promote project labels to group labels
  Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles
  Update and pin the `jwt` gem to ~> 1.5.6
  refactor merge request build service
  Update index.md
  Clarify that Auto Deploy requires a public project.
  19164 Add settings dropdown to mobile screens
  cop for gem fetched from a git source
  Add CHANGELOG entry
  ...

Add traits for the different Event types to the Event factory

2017-02-01T21:02:03+00:00