summaryrefslogtreecommitdiff
path: root/features/steps/snippets/snippets.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-06-19 20:10:19 +0000
committerDouwe Maan <douwe@gitlab.com>2015-06-19 20:10:19 +0000
commite13b523c92d82d10c553a90dd0fb93b73dee3023 (patch)
tree6755fcf5565a83fa7612081f902087601b69849c /features/steps/snippets/snippets.rb
parent6c0db42951d65eeb231046d25302afbd42a43a69 (diff)
parentb6318297fc93ab26108c586af9d34c16fc783589 (diff)
downloadgitlab-ce-e13b523c92d82d10c553a90dd0fb93b73dee3023.tar.gz
Merge branch 'rs-dev-issue-2415' into 'master'
Show user 2FA status on Admin::Users#show | Enabled | Disabled | | ------- | -------- | | ![Screen_Shot_2015-06-19_at_2.58.42_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b81f6a992366105c14e03852385b28f0/Screen_Shot_2015-06-19_at_2.58.42_PM.png) | ![Screen_Shot_2015-06-19_at_2.58.30_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7bb8fd11b6c27615eef19154ffabe2de/Screen_Shot_2015-06-19_at_2.58.30_PM.png) | Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2415 See merge request !851
Diffstat (limited to 'features/steps/snippets/snippets.rb')
0 files changed, 0 insertions, 0 deletions