delta/gitlab/gitlab-ce.git/app/controllers/profiles, branch koding-setting-api gitlab.com: gitlab-org/gitlab-ce.git Address review comments from @smcgivern. 2016-08-18T16:42:02+00:00 Timothy Andrew mail@timothyandrew.net 2016-08-18T06:58:36+00:00 dbedf3a61b5fe233b87b217596dea5572fc741b3 1. Remove an unnecessary (since we're fetching all the records anyway) `pluck` while fetching U2F registration records. 2. Align "Your device was successfully set up!" section with the "U2F Devices" table below. 
1. Remove an unnecessary (since we're fetching all the records anyway)
   `pluck` while fetching U2F registration records.

2. Align "Your device was successfully set up!" section with the "U2F
   Devices" table below.
Allow naming U2F devices. 2016-08-18T16:42:02+00:00 Timothy Andrew mail@timothyandrew.net 2016-08-16T16:18:36+00:00 16c44a5ddd8551224bd94318727a32b52a68425d 1. Display a list of U2F devices on the `two_factor_auth` page. 2. Allow deleting individual U2F devices. 3. Allow setting a (optional) name for a device (during registration). 
1. Display a list of U2F devices on the `two_factor_auth` page.

2. Allow deleting individual U2F devices.

3. Allow setting a (optional) name for a device (during registration).
Avoid to show the original password field when password is automatically seted 2016-08-08T16:55:57+00:00 Carlos Ribeiro mail@carlosribeiro.me 2016-08-08T14:03:30+00:00 ed63ead22aa9fd9fe509f3bebd73223b4ff8b8c5 






Load Javascript U2F library selectively.
2016-07-14T02:49:09+00:00

Timothy Andrew
mail@timothyandrew.net

2016-07-11T07:30:22+00:00

4b33c4c6d1aa529ec22606995123cfa3a151ccee

1. Only on supported Chrome versions

2. Mainly, this lets us simplify the javascript-based U2F check to
   `window.u2f`, where `window.u2f` can either be loaded from the GitLab
   server (for Chrome) or from the Firefox extension.

3. This is a better way to provide browser detection for U2F.





1. Only on supported Chrome versions

2. Mainly, this lets us simplify the javascript-based U2F check to
   `window.u2f`, where `window.u2f` can either be loaded from the GitLab
   server (for Chrome) or from the Firefox extension.

3. This is a better way to provide browser detection for U2F.







Merge branch 'issue_12758' into 'master'

2016-06-17T23:28:22+00:00

Douwe Maan
douwe@gitlab.com

2016-06-17T23:28:22+00:00

00906b5bb6cde8cb60281109060a519a54000c61


Implement custom notification level options

![Screen_Shot_2016-06-17_at_15.31.43](/uploads/3fc47d2f461b3e8b67bb8acaa304cf99/Screen_Shot_2016-06-17_at_15.31.43.png)

![Screenshot_from_2016-06-15_10-52-27](/uploads/88dbdd21d97e80ee772fe08fa0c9b393/Screenshot_from_2016-06-15_10-52-27.png)

part of #12758 

See merge request !4389





Implement custom notification level options

![Screen_Shot_2016-06-17_at_15.31.43](/uploads/3fc47d2f461b3e8b67bb8acaa304cf99/Screen_Shot_2016-06-17_at_15.31.43.png)

![Screenshot_from_2016-06-15_10-52-27](/uploads/88dbdd21d97e80ee772fe08fa0c9b393/Screenshot_from_2016-06-15_10-52-27.png)

part of #12758 

See merge request !4389






Merge branch 'disable-saml-account-unlink' into 'master'

2016-06-17T19:27:51+00:00

Robert Speicher
robert@gitlab.com

2016-06-17T19:27:51+00:00

d9d149244a050f32dd00a9a1898eb5c309eb50eb


Disable the unlink feature for SAML connected accounts (social login).

This disables the ability to manually unlink your SAML account, if you have one connected. In certain scenarios, the only allowed login mechanism can be SAML, and if you unlink your account you will be locked out of the system (configuration dependent).

Fixes #18613

See merge request !4662





Disable the unlink feature for SAML connected accounts (social login).

This disables the ability to manually unlink your SAML account, if you have one connected. In certain scenarios, the only allowed login mechanism can be SAML, and if you unlink your account you will be locked out of the system (configuration dependent).

Fixes #18613

See merge request !4662






Merge master into issue_12758
2016-06-17T17:29:11+00:00

Felipe Artur
felipefac@gmail.com

2016-06-17T15:38:49+00:00

e5aa902860fcc2380fd25a6a4f0736dae159eba3












Re-use notifications dropdown on user profile
2016-06-17T02:34:21+00:00

Felipe Artur
felipefac@gmail.com

2016-06-14T18:36:36+00:00

f82ab42d0534950c1ceb458e0152f329df80ae9d












Implement @DouweM's feedback.
2016-06-16T02:54:13+00:00

Timothy Andrew
mail@timothyandrew.net

2016-06-16T02:54:13+00:00

7ee0898a9ec4a03c9a55841b1cbea67add460c50

- Extract a duplicated `redirect_to`
- Fix a typo: "token", not "certificate"
- Have the "Expires at" datepicker be attached to a text field, not inline
- Have both private tokens and personal access tokens verified in a
  single "authenticate_from_private_token" method, both in the
  application and API. Move relevant logic to
  `User#find_by_personal_access_token`
- Remove unnecessary constants relating to API auth. We don't need a
  separate constant for personal access tokens since the param is the
  same as for private tokens.





- Extract a duplicated `redirect_to`
- Fix a typo: "token", not "certificate"
- Have the "Expires at" datepicker be attached to a text field, not inline
- Have both private tokens and personal access tokens verified in a
  single "authenticate_from_private_token" method, both in the
  application and API. Move relevant logic to
  `User#find_by_personal_access_token`
- Remove unnecessary constants relating to API auth. We don't need a
  separate constant for personal access tokens since the param is the
  same as for private tokens.







Disable the unlink feature for SAML connected accounts (social login).
2016-06-14T23:28:17+00:00

Patricio Cano
suprnova32@gmail.com

2016-06-14T23:28:17+00:00

34bf165147787125a601ad30a4a71ba7f966f724