summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 8.15.0-rc2v8.15.0-rc2Douglas Barbosa Alexandre2016-12-191-1/+1
* Merge branch 'update-gitlab-shell-4-1-1' into 'master' Douglas Barbosa Alexandre2016-12-192-2/+2
* Merge branch '25301-git-2.11-force-push-bug' into 'master' Douglas Barbosa Alexandre2016-12-1910-10/+147
* Merge branch 'master' into 8-15-stableDouglas Barbosa Alexandre2016-12-19799-3078/+19522
|\
| * Merge branch 'zj-mattermost-session' into 'master' Grzegorz Bizon2016-12-174-0/+227
| |\
| | * 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
| |\
| | * Change closes issues reference text on MergeRequest#merge_commit_message to m...Gabriel Gizotti2016-12-163-6/+5
| | * add feature specs to test toggling of merge commit message between message wi...Gabriel Gizotti2016-12-162-3/+75
| | * add eslint disable prefix for prefer-arrow-callback rule on header of merge_r...Gabriel Gizotti2016-12-161-1/+1
| | * Add feature spec to verify all 4 different states of closing issues message o...Gabriel Gizotti2016-12-161-0/+57
| | * 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 merg...Gabriel Gizotti2016-12-162-10/+10
| | * Show either description or closes issues references on MergeRequest#merge_com...Gabriel Gizotti2016-12-163-12/+12
| | * 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 javascripts/merge...Gabriel Gizotti2016-12-162-21/+26
| | * 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 m...Gabriel Gizotti2016-12-161-24/+14
| | * 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 w...Gabriel Gizotti2016-12-161-2/+8
| | * Add toggle links for using default message and description on change merge co...Gabriel Gizotti2016-12-162-0/+29
| | * shorter lines on MergeRequest#merge_commit_messageGabriel Gizotti2016-12-161-2/+9
| | * only look for issues mentioned on description on MergeRequest#issues_mentione...Gabriel Gizotti2016-12-162-3/+5
| | * 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
| |\ \
| | * | 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
View Lorry Controller Status