delta/gitlab/gitlab-ce.git, branch admin_notes_for_user

Create admin notes for users

2015-12-08T09:45:26+00:00

Merge branch 'rs-validators' into 'master'

2015-12-08T08:42:17+00:00


Add more custom validators

These custom validators allow us to DRY up our models a bit.

See merge request !1944

Merge branch 'fix-merge-request-that-removes-submodule' into 'master'

2015-12-08T08:36:23+00:00


Fix 500 error when creating a merge request that removes a submodule

Fixes #3476 

See merge request !1989

Merge branch 'gemfile_fix' into 'master'

2015-12-08T07:49:07+00:00


Add explicit reference to rouge 1.10.1

We are relying on rouge 1.10.1 but nothing is referencing to this version and it is easy to lose this dependence. Previously, it was updated directly in Gemfile.lock which is not reliable way :)

https://gitlab.com/gitlab-org/gitlab-ce/commit/e20529cec4f6de0c2c1589da99abb8714ea1c1c1

`gollum-lib` has a dependence `rouge 1.9` which is old for us.

See merge request !1937

add explicit reference to rouge 1.10.1

2015-12-08T07:05:02+00:00

Merge branch 'master' into fix-merge-request-that-removes-submodule

2015-12-08T00:41:18+00:00

Merge branch 'fix-random-test' into 'master'

2015-12-08T00:02:40+00:00


Fix random failing test - delete attachment

Make sure we wait for AJAX request to finish before end test and cleanup
database

Signed-off-by: Dmitriy Zaporozhets 

cc @rspeicher @DouweM 

Fixes #3885 

See merge request !2007

Fix random failing test - delete attachment

2015-12-07T22:40:17+00:00

Make sure we wait for AJAX request to finish before end test and cleanup
database

Signed-off-by: Dmitriy Zaporozhets

Inline Gitlab::Blacklist in NamespaceValidator

2015-12-07T21:57:26+00:00

Add custom NamespaceNameValidator

2015-12-07T21:57:26+00:00