delta/gitlab/gitlab-ce.git/app/models/user.rb, branch fix-diff-comments gitlab.com: gitlab-org/gitlab-ce.git Allow LDAP users to change their email if it was not set by the LDAP server 2016-01-19T15:25:38+00:00 Douwe Maan douwe@gitlab.com 2016-01-19T15:25:38+00:00 98e1a5b63424b6912de98ee5055d3f9e57e63899 






fixed LDAP activation on login to use new ldap_blocked state
2016-01-14T05:31:27+00:00

Gabriel Mazetto
gabriel@gitlab.com

2016-01-14T05:31:27+00:00

dd6fc01ff8a073880b67a323a547edeb5d63f167












Repair ldap_blocked state when no ldap identity exist anymore
2016-01-08T18:26:04+00:00

Gabriel Mazetto
gabriel@gitlab.com

2016-01-06T07:38:52+00:00

ec67e9be1d7486199b47e19c766202a8bfdefe93












Add ldap_blocked as new state to users state machine
2016-01-08T18:26:04+00:00

Gabriel Mazetto
gabriel@gitlab.com

2015-12-29T19:53:55+00:00

bc7ef8e5b7a002ca6bc2d7a5e6be11b4a59b6710












Annotate models
2016-01-06T13:09:55+00:00

Stan Hu
stanhu@gmail.com

2016-01-06T02:30:59+00:00

79c0e7212af0a6b0243bc0512a75eb936fb8d862












Prevent duplicate "username has already been taken" validation message
2016-01-03T01:03:28+00:00

Robert Speicher
rspeicher@gmail.com

2016-01-03T00:53:45+00:00

fd178c1e7d23b0bf96565ae5177485e847c9271d

Closes #201 - two-year-old bug, woo! :boom: :tada:





Closes #201 - two-year-old bug, woo! :boom: :tada:







Merge branch 'add_email_unlock' into 'master'

2015-12-21T17:53:20+00:00

Robert Speicher
robert@gitlab.com

2015-12-21T17:53:20+00:00

9570495e75f90d1011531753dd41f0c06e8fcf99


Allow account unlock via email

We see a lot of users get confused about what it means when your account gets
locked. Many try to reset their password and are still faced with a lockout.
With this change, users receive an email that allows them to unlock their
account immediately. The previous behavior where the account is auto-unlocked
after a time also still works.

See merge request !2049





Allow account unlock via email

We see a lot of users get confused about what it means when your account gets
locked. Many try to reset their password and are still faced with a lockout.
With this change, users receive an email that allows them to unlock their
account immediately. The previous behavior where the account is auto-unlocked
after a time also still works.

See merge request !2049






Fixed Rubocop offenses
2015-12-15T02:53:52+00:00

Gabriel Mazetto
gabriel@gitlab.com

2015-12-15T02:53:52+00:00

b5291f95996743067bbec5a32f9c6cf0d34b36c7












Allow account unlock via email
2015-12-14T21:35:02+00:00

Drew Blessing
drew@gitlab.com

2015-12-14T21:34:46+00:00

be41d84fb078667694ecbf5f2729175fbf8b0343












Merge branch 'master' into ci/persist-registration-token
2015-12-14T11:26:40+00:00

Grzegorz Bizon
grzegorz.bizon@ntsn.pl

2015-12-14T10:46:02+00:00

2ec93abed7a1a3aa49b3267342824e0743de0f54

* master: (66 commits)
  Fix runners admin view
  Fix migrations
  Rename mention of gitlab-git-http-server to gitlab-workhorse
  Bump Redis requirement to 2.8 for Sidekiq 4 requirements
  Fix wording on runner setup page
  add details on how to change saml button label
  Fix tests
  Move awards back to gray panel and few improvements to sidebar
  Few UI improvements to new sidebar implementation
  Fix tests for new issuable sidebar
  Update changelog
  Implement new sidebar for merge request page
  Make edit link on issuable sidebar works
  Redesign issue page for new sidebar
  Move awards css to separate file
  Implement issuable sidebar partial
  Update CHANGELOG
  Clarify cache behavior
  Run builds from projects with enabled CI
  Use Gitlab::Git instead of Ci::Git
  ...

Conflicts:
	db/schema.rb





* master: (66 commits)
  Fix runners admin view
  Fix migrations
  Rename mention of gitlab-git-http-server to gitlab-workhorse
  Bump Redis requirement to 2.8 for Sidekiq 4 requirements
  Fix wording on runner setup page
  add details on how to change saml button label
  Fix tests
  Move awards back to gray panel and few improvements to sidebar
  Few UI improvements to new sidebar implementation
  Fix tests for new issuable sidebar
  Update changelog
  Implement new sidebar for merge request page
  Make edit link on issuable sidebar works
  Redesign issue page for new sidebar
  Move awards css to separate file
  Implement issuable sidebar partial
  Update CHANGELOG
  Clarify cache behavior
  Run builds from projects with enabled CI
  Use Gitlab::Git instead of Ci::Git
  ...

Conflicts:
	db/schema.rb