summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | 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
| | | | | | | | |
| * | | | | | | | Fix MembersHelperDouglas Barbosa Alexandre2016-12-161-11/+11
| | | | | | | | |
| * | | | | | | | Add CHANGELOG entryDouglas Barbosa Alexandre2016-12-161-0/+4
| | | | | | | | |
| * | | | | | | | Adds sort dropdown for group membersNur Rony2016-12-168-26/+127
| | | | | | | | |
* | | | | | | | | Merge branch 'fix/keep-compatility-ruby-21' into 'master' Stan Hu2016-12-161-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid use of Hash#dig to keep compatibility with Ruby 2.1 See merge request !8153
| * | | | | | | | | Avoid use of Hash#dig to keep compatibility with Ruby 2.1fix/keep-compatility-ruby-21Douglas Barbosa Alexandre2016-12-161-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bitbucket-oauth2' into 'master' Douglas Barbosa Alexandre2016-12-1656-539/+1271
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Bitbucket importer to use BitBucket API Version 2 ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/19946 ## Screenshots (if relevant) This MR needs the following permissions in the Bitbucket OAuth settings: ![image](/uploads/a26ae5e430a724bf581a92da7028ce3c/image.png) - [] ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5995
| * | | | | | | | Avoid use of Hash#dig to keep compatibility with Ruby 2.1Douglas Barbosa Alexandre2016-12-164-10/+10
| | | | | | | | |
| * | | | | | | | Fix import issues methodDouglas Barbosa Alexandre2016-12-161-4/+4
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre2016-12-16588-1818/+15074
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix rubucop offensesbitbucket-oauth2Douglas Barbosa Alexandre2016-12-162-28/+27
| | | | | | | | | |
| * | | | | | | | | BB importer: Fix documantationValery Sizov2016-12-161-5/+3
| | | | | | | | | |
| * | | | | | | | | BB importer: Adressed more review commentsValery Sizov2016-12-162-15/+23
| | | | | | | | | |
| * | | | | | | | | Use new generic image for project importAchilleas Pipinellis2016-12-164-2/+2
| | | | | | | | | |
| * | | | | | | | | Merge branch 'bitbucket-oauth2' of gitlab.com:gitlab-org/gitlab-ce into ↵Achilleas Pipinellis2016-12-161-6/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bitbucket-oauth2
| | * \ \ \ \ \ \ \ \ Merge branch 'bitbucket-oauth2' of gitlab.com:gitlab-org/gitlab-ce into ↵Valery Sizov2016-12-160-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bitbucket-oauth2
| | * | | | | | | | | | BB importer: address review commentValery Sizov2016-12-162-7/+5
| | | | | | | | | | | |
| | * | | | | | | | | | BB importer: Milestone importerValery Sizov2016-12-163-0/+12
| | | | | | | | | | | |
| * | | | | | | | | | | Refactor Bitbucket import docsAchilleas Pipinellis2016-12-1612-25/+59
| | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | BB importer: Milestone importerValery Sizov2016-12-163-0/+12
| |/ / / / / / / / /
| * | | | | | | | | BB importer: Added note about linking BB users and GitLab users[ci skip]Valery Sizov2016-12-161-1/+2
| | | | | | | | | |
| * | | | | | | | | BB importer: Fixed bug with putting expired token to a project.clone_urlValery Sizov2016-12-154-5/+8
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-1485-211/+1346
| |\ \ \ \ \ \ \ \ \
View Lorry Controller Status