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

Don't allow to edit award emoji comments

2015-12-10T12:39:37+00:00

Merge branch 'rs-reset-db' into 'master'

2015-12-10T09:50:21+00:00


Run db:reset before db:create on CI

Should prevent build failures caused by missing migrations, such as
https://gitlab.com/gitlab-org/gitlab-ce/builds/439927

See merge request !2045

Merge branch 'devise_paranoid_mode' into 'master'

2015-12-10T01:58:11+00:00


Enable Devise paranoid mode and ensure the returned message is the same
every time. This will prevent user enumeration (low impact). 

Prior to this change a user could type an email in the password reset
field and if the email didn't exist it returned an error. If the email
was valid it returned a message saying the forgot password link had been
emailed. After this change the user will receive a message that if the
email is in our database the reset link will be emailed. 

I also changed the throttle mechanism so it still works the same but
now returns the exact same message as above. Previously it would say
'You've already sent a request. Wait a few minutes'. This also allows
user enumeration, although it requires a double-check.

Related to https://dev.gitlab.org/gitlab/gitlabhq/issues/2624

See merge request !2044

Merge branch 'ui-fix' into 'master'

2015-12-10T01:17:34+00:00


Fix list with controls display

Introduced in !2025

## Before

![before](/uploads/969f021f1f97062439cc4e836f29bdf6/before.png)

## After

![after](/uploads/defd46ddbd8392625848dfd3ac067869/after.png)

Signed-off-by: Dmitriy Zaporozhets 


See merge request !2048

Use devise paranoid mode and ensure the same message is returned every time

2015-12-10T00:40:37+00:00

Skipped CI because it has already passed. Had to rebase due to CHANGELOG.

Merge pull request #9897 from atomaka/atomaka/bugfix/consistent-no-ssh-message

2015-12-10T00:28:53+00:00

Fix inconsistency with no ssh key message

Fix list with controls display

2015-12-10T00:24:10+00:00

Signed-off-by: Dmitriy Zaporozhets

Merge remote-tracking branch 'dev/master' into 'master'

2015-12-09T23:43:00+00:00

Merge branch 'yaml_safe_load' into 'master'

2015-12-09T23:42:24+00:00


Use YAML.safe_load

See merge request !1941

Merge branch 'issue_3854' into 'master'

2015-12-09T21:27:47+00:00


Downcase commit author email for matching with users

Closes #3854 

See merge request !1992