summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into dockerfile-templatesdockerfile-templatesKamil Trzcinski2016-12-182868-35378/+79204
|\
| * Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' ↵Sean McGivern2016-12-1721-44/+45
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Enable Style/MultilineOperationIndentation in Rubocop Fixes #25741 See merge request !8125
| | * Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741Rydkin Maxim2016-12-1621-44/+45
| | |
| * | Merge branch 'zj-mattermost-session' into 'master' Grzegorz Bizon2016-12-174-0/+227
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mattermost session This branch is based of tag v8.14.4 so I could test on an instance better. But stuck on the tests, as setting up the whole doorkeeper stuff doesn't seem to be supported for testing. See merge request !8033
| | * | Fix rubocop failureszj-mattermost-sessionKamil Trzcinski2016-12-172-17/+23
| | | |
| | * | Store mattermost_url in settingsKamil Trzcinski2016-12-174-13/+35
| | | |
| | * | Improve Mattermost Session specsKamil Trzcinski2016-12-172-26/+50
| | | |
| | * | Ensure the session is destroyedZ.J. van de Weg2016-12-171-3/+5
| | | |
| | * | Improve session testsZ.J. van de Weg2016-12-173-45/+74
| | | |
| | * | Setup mattermost sessionZ.J. van de Weg2016-12-172-0/+144
| |/ /
| * | Merge branch 'cleaner-merge-commit-messages' into 'master' Sean McGivern2016-12-179-21/+242
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Cleaner merge commit messages Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23462 See merge request !7722
| | * | Change closes issues reference text on MergeRequest#merge_commit_message to ↵Gabriel Gizotti2016-12-163-6/+5
| | | | | | | | | | | | | | | | match existing text generated by the system
| | * | add feature specs to test toggling of merge commit message between message ↵Gabriel Gizotti2016-12-162-3/+75
| | | | | | | | | | | | | | | | with description and without
| | * | add eslint disable prefix for prefer-arrow-callback rule on header of ↵Gabriel Gizotti2016-12-161-1/+1
| | | | | | | | | | | | | | | | merge_request.js file
| | * | Add feature spec to verify all 4 different states of closing issues message ↵Gabriel Gizotti2016-12-161-0/+57
| | | | | | | | | | | | | | | | on Merge Request show page.
| | * | add guard clause to MergeRequest#issues_mentioned_but_not_closingGabriel Gizotti2016-12-161-9/+6
| | | |
| | * | add js prefix to classes used to toggle description on commit message in ↵Gabriel Gizotti2016-12-162-10/+10
| | | | | | | | | | | | | | | | merge request
| | * | Show either description or closes issues references on ↵Gabriel Gizotti2016-12-163-12/+12
| | | | | | | | | | | | | | | | MergeRequest#merge_commit_message so closes issues references are not duplicated
| | * | Unify commit message listeners in one functionGabriel Gizotti2016-12-161-11/+6
| | | |
| | * | better text for mentioned but not closedGabriel Gizotti2016-12-161-1/+1
| | | |
| | * | add mentioned but not closed message to the same line as closes issueswqGabriel Gizotti2016-12-161-13/+14
| | | |
| | * | extract duplicate logic into a variable on _commit_message_containerGabriel Gizotti2016-12-161-2/+3
| | | |
| | * | Better `Closes issues` text for MergeRequest#merge_commit_messageGabriel Gizotti2016-12-161-1/+2
| | | |
| | * | move javascript code from _commit_message_container view to ↵Gabriel Gizotti2016-12-162-21/+26
| | | | | | | | | | | | | | | | javascripts/merge_request.js
| | * | backend completely drives creation of merge commit messageGabriel Gizotti2016-12-165-26/+37
| | | |
| | * | Remove unnecessary code from MergeRequest#issues_mentioned_but_not_closingGabriel Gizotti2016-12-161-4/+2
| | | |
| | * | describe #closes_issues and describe # #issues_mentioned_but_not_closing on ↵Gabriel Gizotti2016-12-161-24/+14
| | | | | | | | | | | | | | | | merge_request_spec.rb
| | * | only render MR description toggle javascript if description is availableGabriel Gizotti2016-12-161-20/+19
| | | |
| | * | keep branch being merged, MR title and MR reference in merge commit message ↵Gabriel Gizotti2016-12-161-2/+8
| | | | | | | | | | | | | | | | when using description
| | * | Add toggle links for using default message and description on change merge ↵Gabriel Gizotti2016-12-162-0/+29
| | | | | | | | | | | | | | | | commit message container
| | * | shorter lines on MergeRequest#merge_commit_messageGabriel Gizotti2016-12-161-2/+9
| | | |
| | * | only look for issues mentioned on description on ↵Gabriel Gizotti2016-12-162-3/+5
| | | | | | | | | | | | | | | | MergeRequest#issues_mentioned_but_not_closing
| | * | better mentioned but not closing message and iconGabriel Gizotti2016-12-162-9/+2
| | | |
| | * | diplays mentioned but not merged message on MR show pageGabriel Gizotti2016-12-162-0/+20
| | | |
| | * | introduce MergeRequest#issues_mentioned_but_not_closingGabriel Gizotti2016-12-162-15/+46
| | | |
| | * | Remove whole description from #merge_commit_message and add add closed issuesGabriel Gizotti2016-12-162-5/+12
| | | |
| * | | Merge branch '23573-sort-functionality-for-project-member' into 'master' Douglas Barbosa Alexandre2016-12-1713-13/+356
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sorting functionality for group/project members ## What does this MR do? This MR adds sort functionality to group/project members list. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? This MR helps the user to manage and find users of a group/project fast. It also improves UX. ## Screenshots (if relevant) **Before** ![before-pr-member](/uploads/412bfdfddc63e48a62e2095d664660b5/before-pr-member.png) **After** ![pr-after](/uploads/ae23a5c7689b46d26a948f22a0ac2360/pr-after.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - Tests - [x] 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21622 Closes #23573 See merge request !7032
| | * | | Fix query in Projects::ProjectMembersController to fetch members23573-sort-functionality-for-project-memberDouglas Barbosa Alexandre2016-12-161-2/+2
| | | | |
| | * | | Improve test for sort dropdown on members pageNur Rony2016-12-163-1/+19
| | | | |
| | * | | Fix sort dropdown alignmentNur Rony2016-12-161-2/+2
| | | | |
| | * | | Undo changes on members search button stylesheetDouglas Barbosa Alexandre2016-12-161-16/+15
| | | | |
| | * | | Use factories to create project/group membership on specsDouglas Barbosa Alexandre2016-12-162-4/+4
| | | | |
| | * | | Remove unused id from shared members sort dropdownDouglas Barbosa Alexandre2016-12-161-1/+1
| | | | |
| | * | | Fix sort functionality on project/group members to return invited usersDouglas Barbosa Alexandre2016-12-161-4/+15
| | | | |
| | * | | Refactor MembersHelper#filter_group_project_member_pathDouglas Barbosa Alexandre2016-12-161-5/+1
| | | | |
| | * | | Remove unnecessary curly braces from sort dropdown partialDouglas Barbosa Alexandre2016-12-161-1/+1
| | | | |
| | * | | Sort group/project members alphabetically by defaultDouglas Barbosa Alexandre2016-12-164-3/+17
| | | | |
| | * | | Add feature spec for sort functionality on group/project members listDouglas Barbosa Alexandre2016-12-162-0/+164
| | | | |
| | * | | Add option to sort group/project members by access levelDouglas Barbosa Alexandre2016-12-162-0/+20
| | | | |
| | * | | Fix sort functionality for group/project membersDouglas Barbosa Alexandre2016-12-163-12/+28
| | | | |
View Lorry Controller Status