kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/views/projects
History
Douwe Maan 077e32740c 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
 		2016-06-16 09:54:53 +00:00
..
artifacts CI build page UI update 2016-06-10 12:07:51 +01:00
badges Remove header title from project pages 2016-05-26 17:58:44 +02:00
blame Remove header title from project pages 2016-05-26 17:58:44 +02:00
blob Remove header title from project pages 2016-05-26 17:58:44 +02:00
branches Use responsive top-area on project branches and tags pages 2016-06-08 18:26:29 +03:00
builds Fix keep action of build artifacts widget 2016-06-13 19:19:11 +02:00
buttons Fix project star tooltip in to show actual message. 2016-06-15 15:14:23 +03:00
ci Pipeline artifacts download button wording improved 2016-06-10 17:52:46 +01:00
commit Only show branches for revert / cherry-pick 2016-06-13 11:05:22 +01:00
commits Merge branch 'commits-ui' into 'master' 2016-06-15 20:24:13 +00:00
compare Finish styling sub nav 2016-06-07 09:08:15 -05:00
container_registry Show created_at in table column 2016-06-15 16:16:21 +02:00
deploy_keys Fixed project settings alert colors 2016-05-16 15:40:44 +01:00
deployments Create_deployment ability is need to create retry or rollback deployment 2016-06-15 12:56:02 +02:00
diffs Merge branch 'toggle-whitespace-button-for-compare-page' into 'master' 2016-06-15 22:48:39 +00:00
environments Improve forms and specs 2016-06-15 12:07:06 +02:00
find_file Remove header title from project pages 2016-05-26 17:58:44 +02:00
forks
…
generic_commit_statuses Merge branch 'improve-pipeline-design' into 'master' 2016-05-25 20:50:26 +00:00
graphs Use pipelines in context of Project 2016-06-03 13:34:03 +02:00
group_links Fixed failing tests 2016-04-25 16:56:17 +01:00
hooks Backported from EE shared form for web hooks 2016-06-03 11:04:27 +01:00
imports Sanitize repo paths in new project error message 2016-05-04 14:06:07 -07:00
issues Remove div between ul and li 2016-06-13 14:30:40 -05:00
labels Add handler icon to prioritized labels 2016-06-15 10:35:58 -05:00
merge_requests Merge branch 'commits-ui' into 'master' 2016-06-15 20:24:13 +00:00
milestones Merge branch 'milestone-date-clear' into 'master' 2016-06-15 20:52:09 +00:00
network Fix failing test. 2016-06-10 09:28:07 -06:00
notes UI and copywriting improvements 2016-06-14 13:18:14 +02:00
pipelines Merge branch 'list-items' into 'master' 2016-06-15 13:53:10 +00:00
project_members Fix wrong partial path in JS view 2016-06-15 17:27:37 +02:00
protected_branches Fixed project settings alert colors 2016-05-16 15:40:44 +01:00
refs
…
releases Remove header title from project pages 2016-05-26 17:58:44 +02:00
repositories Added author to various Markdown calls in views 2016-05-26 17:14:06 +02:00
runners Fix grammar and wording in text on various pages. 2016-05-22 10:41:30 -06:00
services Hide description on mobile 2016-05-26 09:15:56 +01:00
snippets Remove header title from project pages 2016-05-26 17:58:44 +02:00
tags Improve buttons size and paddings in the lists 2016-06-08 20:44:39 +03:00
tree Start styling sub nav 2016-06-07 08:59:40 -05:00
triggers Resolve some issues Jacob brought up. 2016-05-24 09:04:43 -06:00
variables Changed table border color 2016-05-16 10:26:11 +01:00
wikis Remove icons from button on wiki pages. Also consistent padding between buttons there 2016-06-08 21:01:53 +03:00
_activity.html.haml fix bug causing the infinite scrolling in activity feeds to break when you click a link and navigate back 2016-04-20 17:47:07 +01:00
_bitbucket_import_modal.html.haml
…
_builds_settings.html.haml Project settings UI update 2016-05-20 08:49:31 +01:00
_commit_button.html.haml
…
_errors.html.haml Standardize the way we check for and display form errors 2016-04-04 21:37:07 -04:00
_files.html.haml
…
_find_file_link.html.haml
…
_github_import_modal.html.haml
…
_gitlab_import_modal.html.haml
…
_home_panel.html.haml UI and copywriting improvements 2016-06-14 13:18:14 +02:00
_last_commit.html.haml Cleanup changes 2016-04-13 15:58:22 +02:00
_last_push.html.haml Start builds redesign 2016-05-04 16:45:37 -05:00
_md_preview.html.haml Fix error on non-issue pages with comment areas. 2016-06-05 12:24:36 -06:00
_merge_request_settings.html.haml Allow or not merge MR with failed build 2016-06-10 14:36:54 +02:00
_readme.html.haml Start builds redesign 2016-05-04 16:45:37 -05:00
_zen.html.haml Fixed typo in zen.scss and corresponding views 2016-05-04 14:04:13 -07:00
activity.html.haml Remove header title from project pages 2016-05-26 17:58:44 +02:00
edit.html.haml Allow or not merge MR with failed build 2016-06-10 14:36:54 +02:00
empty.html.haml Backend for a gitignores dropdown 2016-05-20 15:58:36 -05:00
new.html.haml Move group creation text to below the 'Project owner' field. 2016-06-15 12:55:05 -06:00
no_repo.html.haml
…
remove_fork.js.haml
…
show.atom.builder Remove `event_to_atom` helper 2016-05-23 12:37:40 -04:00
show.html.haml Use container helper instead of hard coded container 2016-06-08 14:03:01 -05:00
transfer.js.haml
…
update.js.haml
…