summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-10-25 02:47:27 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-10-25 02:47:27 +0000
commit132e3f547194de1923db258d4022b7f473f176e0 (patch)
tree9db183a56b2b58282aa1f1047f4cef565251f29e /.gitlab-ci.yml
parentadd3a2c4431f29ca84c956f5604769505f0f0904 (diff)
parent541b9eb65828719c6dea20bc750873f2882d9d07 (diff)
downloadgitlab-ce-132e3f547194de1923db258d4022b7f473f176e0.tar.gz
Merge branch 'register-tab' into 'master'
Only show register tab if signup enabled. ## What does this MR do? Fixes a regression where the register tab is activated, even if sign-up enabled is not activated in application_settings. ## Screenshots (if relevant) When signup is disabled: ![Screen_Shot_2016-10-22_at_8.56.23_PM](/uploads/bd0fa5f27114779c0d290a8151c1c253/Screen_Shot_2016-10-22_at_8.56.23_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/23654 See merge request !7058
Diffstat (limited to '.gitlab-ci.yml')
0 files changed, 0 insertions, 0 deletions