Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab Community Edition
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

fdc944e0

Commit fdc944e0 authored 8 years ago by Sean McGivern

Downloads
- Plain Diff

Merge branch 'add_info_to_qr' into 'master'

Add GitLab host to 2FA QR and manual info

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25545

See merge request !6941

parents 01adeb17 55f224e4

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/profiles/two_factor_auths_controller.rb 6 additions, 2 deletions

app/controllers/profiles/two_factor_auths_controller.rb
app/views/profiles/two_factor_auths/show.html.haml 1 addition, 1 deletion

app/views/profiles/two_factor_auths/show.html.haml
changelogs/unreleased/add_info_to_qr.yml 4 additions, 0 deletions

changelogs/unreleased/add_info_to_qr.yml

with 11 additions and 3 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment