Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-01-03Updated the "users" to "members" matches in the viewJose Ivan Vargas
Reverted the change from the "expires_at" to "expires_at_groups" in the groups controller
2016-12-31HAMLLint: Fix `ClassAttributeWithStaticValue` offencesKushal Pandya
2016-12-17Move all project buttons to headerAnnabel Dunstone Gray
2016-12-17Move access request buttons to project headerAnnabel Dunstone Gray
2016-12-17Improve test for sort dropdown on members pageNur Rony
2016-12-17Remove unused id from shared members sort dropdownDouglas Barbosa Alexandre
2016-12-17Remove unnecessary curly braces from sort dropdown partialDouglas Barbosa Alexandre
2016-12-17Sort group/project members alphabetically by defaultDouglas Barbosa Alexandre
2016-12-17Adds sort dropdown for group membersNur Rony
2016-12-09Merge branch '23305-leave-project-and-leave-group-should-be-buttons' into ↵Jacob Schatz
'master' Remove 'Leave Project' and 'Leave Group' from settings dropdowns ## What does this MR do? Removes `Leave Project` and `Leave Group` from the settings dropdown. Adds it to the `views/shared/members/access_request_buttons.html.haml`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-11-19_at_15.34.26](/uploads/5c66a025513b4780a9e881f0036381e4/Screen_Shot_2016-11-19_at_15.34.26.png) ![Screen_Shot_2016-11-19_at_15.35.29](/uploads/ed74a5dfe982cf65bb49c0c4fb307061/Screen_Shot_2016-11-19_at_15.35.29.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] 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? Closes #23305 See merge request !7600
2016-12-09Merge branch 'members-dropdowns' into 'master' Fatih Acet
Updated members dropdowns ## What does this MR do? EE has different dropdowns to allow for group LDAP members to be overridden, this ports the dropdown changes over to reduce conflicts. ## Screenshots (if relevant) ![Screen_Shot_2016-12-07_at_15.28.20](/uploads/6cb6def34015b024dc878aa3b99be4a0/Screen_Shot_2016-12-07_at_15.28.20.png) See merge request !7974
2016-12-09Updated JS based on reviewPhil Hughes
Fixed group links dropdown to match
2016-12-07Updated members dropdownsPhil Hughes
This ports some code over from EE to reduce conflicts
2016-12-05Fixed if statement to use global group & project variablesPhil Hughes
2016-12-02Fixed Ruby to be better for performancePhil Hughes
Fixed controls not showing in groups which fixes tests
2016-12-02Shows group members in the project members listPhil Hughes
Closes #24122
2016-11-26Removed leave buttons from settings dropdownsLuke "Jared" Bennett
Updated specs
2016-10-06Changed how collections are renderedPhil Hughes
Used variables in haml for replicated checks Fixed broken conflict
2016-09-13Admin group members UI fixPhil Hughes
2016-09-13Fixed removing groupsPhil Hughes
2016-09-13Added test for updating groups permissionsPhil Hughes
2016-09-13Updated some specsPhil Hughes
Fixed issue with group name not showing
2016-09-13Tests updatePhil Hughes
2016-09-13Removes row from dom when deletingPhil Hughes
Fixed spacing with buttons Disables group form when user doesnt have correct permissions
2016-09-13Mobile spacing improvementsPhil Hughes
2016-09-13Removed console logPhil Hughes
Hides time on mobile
2016-09-13Mobile improvementsPhil Hughes
Added group name to members row Fixed saving group member
2016-09-13Included groups on project_members pagePhil Hughes
2016-09-13Updated members UIPhil Hughes
2016-08-19Allow project group links to be expiredSean McGivern
2016-08-18Add expiration date to group membershipsSean McGivern
2016-08-18Merge branch 'master' into expiration-date-on-membershipsSean McGivern
2016-08-18Add MemberExpirationDate JS helperSean McGivern
This helper adds a datepicker to all `js-access-expiration-date` elements. If that element is a child of a `clearable-input` element and has a sibling `js-clear-input` element, then it will show a working clear button to the right of the input field.
2016-08-18Add MemberExpirationDate JS helperSean McGivern
This helper adds a datepicker to all `js-access-expiration-date` elements. If that element is a child of a `clearable-input` element and has a sibling `js-clear-input` element, then it will show a working clear button to the right of the input field.
2016-08-11Show member roles to all users on members pageDouwe Maan
2016-08-09Use "is_a?" because it is more readable than checking the "type" field.Adam Niedzielski
2016-08-07Single quotes all the way.Adam Niedzielski
2016-08-06Remove inline JavaScript. Add datepicker to the edit form.Adam Niedzielski
2016-08-05Allow to edit access expiration date.Adam Niedzielski
2016-08-05Better presentation of member expiration.Adam Niedzielski
2016-08-04Add Member#expires? method.Adam Niedzielski
2016-08-03Display expiration date in the project member list.Adam Niedzielski
2016-07-07Fix invite user feature test and improve request member UI rowDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-07-07Improve UI for member row on project/group members pagesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-07-07Add data when member joined a teamValery Sizov
2016-07-05New :request_access ability to replace a ugly helperRémy Coutable
- Group / project members cannot request access - Group members cannot request access to a group's project This addresses an issue where project owners could request access to their own project, leading to UI inconsistency where their requester status would replace their owner status. Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-01Exclude requesters from Project#members, Group#members and User#membersRémy Coutable
And create new Project#requesters, Group#requesters scopes. Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-01Improve the request / withdraw access buttonRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-20Display group/project access requesters separately in adminRémy Coutable
Also, reuse partials from the non-admin views. Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-17Address Douwe's feedbackRémy Coutable
- Make it more explicit that `source` must respond to `#group` and that `#group` must be present. - Indent subsequent lines of a multi-line condition. Signed-off-by: Rémy Coutable <remy@rymai.me>