delta/gitlab/gitlab-ce.git, branch rs-dev-issue-2415

Use User#two_factor_enabled instead of otp_required_for_login

2015-06-19T19:14:37+00:00

Add 2FA status to Admin::Users#show

2015-06-19T19:04:47+00:00

Add convenience methods to User for getting and setting 2FA status

2015-06-19T18:59:42+00:00

Move the User dashboard enum further up in the class

2015-06-19T18:59:07+00:00

Merge branch 'update-rake-docs-for-omnibus-assets' into 'master'

2015-06-19T14:54:02+00:00

Update maintenance documentation to explain no need to recompile asssets for omnibus installations

See merge request !847

Update maintenance documentation to explain no need to recompile asssets for omnibus installations

2015-06-19T14:23:45+00:00

Merge branch 'revert-placeholder' into 'master'

2015-06-19T08:03:10+00:00

Revert "Changed the placeholder text and modified the css class to make it visible"

This reverts commit c39c823421e9dfd3add4cb49a82fa32831797aa0.

/cc @marin

See merge request !845

Set build preparation script as executable.

2015-06-19T07:17:47+00:00

Revert "Changed the placeholder text and modified the css class to make it visible"

2015-06-18T20:50:33+00:00

This reverts commit c39c823421e9dfd3add4cb49a82fa32831797aa0.

Merge branch 'add-test-for-project-search-results' into 'master'

2015-06-18T18:17:30+00:00

Add init test for ProjectSearchResults

Regression test for: https://github.com/gitlabhq/gitlabhq/pull/9368

See merge request !788