delta/gitlab/gitlab-ce.git/spec/controllers, branch ad_coder

Merge branch 'fix-issue-2593' into 'master'

2015-09-21T20:46:15+00:00


Fix Error 500 when comparing non-existing branches

Closes #2593

See merge request !1355

Remove milestones from merge requests when milestones are deleted

2015-09-21T14:00:55+00:00

Reported by https://github.com/gitlabhq/gitlabhq/issues/9643

Bump devise-two-factor to 2.0.0

2015-09-20T01:16:18+00:00

Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605

See https://github.com/tinfoil/devise-two-factor/pull/43

Fix Error 500 when comparing non-existing branches

2015-09-18T19:02:01+00:00

Closes #2593

remove API calls from CE to CI

2015-09-18T16:02:11+00:00

Merge branch 'ci_projects_order' into 'master'

2015-09-18T08:54:06+00:00


Fix: ci projects order

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

See merge request !1333

Fix: ci projects order

2015-09-17T17:12:17+00:00

Merge branch 'fix-issue-2382' into 'master'

2015-09-17T08:04:37+00:00

Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity

Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone".

Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c89cc8a0a9fa549deac433f17b890913/image.png)

Closes #2382

See merge request !1227

Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g

2015-09-15T20:40:35+00:00

# Conflicts:
#	Gemfile.lock

Fix ci/projects_controller_spec.rb

2015-09-15T18:40:52+00:00