summaryrefslogtreecommitdiff
path: root/features/snippets
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-06-16 09:54:53 +0000
committerDouwe Maan <douwe@gitlab.com>2016-06-16 09:54:53 +0000
commit077e32740c150cb4216f5ecf74229df159dceea0 (patch)
tree5b4c2bccda21fb1847c304371634e9e11760917c /features/snippets
parent5b4e99387a055b196fc89cb96b6c08e9d90e8404 (diff)
parentb21980bff48de425a3994cb3914650d06d48e486 (diff)
downloadgitlab-ce-077e32740c150cb4216f5ecf74229df159dceea0.tar.gz
Merge branch 'backport-view-condition-improvement-from-ee-460' into 'master'
Fix permission checks in member row (backport from gitlab-org/gitlab-ee!460) ## What does this MR do? It improves the check we use to display or not the members' access and controls in the members list. ## Are there points in the code the reviewer needs to double check? No, I replaced an helper with just a permission check so I think it's a better solution. ## Why was this MR needed? There were a spec failure in gitlab-org/gitlab-ee!460 because of the refactor done in the "request access" MR. ## What are the relevant issue numbers? None. ## Does this MR meet the acceptance criteria? - No CHANGELOG needed - [x] Tests - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4670
Diffstat (limited to 'features/snippets')
0 files changed, 0 insertions, 0 deletions