summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix typofix/ci-readme-typoJames Lopez2016-12-191-1/+1
* Merge branch 'fix-groups-helper-spec' into 'master' Stan Hu2016-12-191-1/+1
|\
| * Always use `fixture_file_upload` helper to upload files in tests.fix-groups-helper-specRuben Davila2016-12-181-1/+1
|/
* Merge branch 'update-nginx-config-for-websockets' into 'master' Kamil Trzciński2016-12-182-0/+15
|\
| * Upgrade NGINX configuration files to add websocket supportNick Thomas2016-12-122-0/+15
* | Merge branch 'correct-slack-slash-commands-pretty-path' into 'master' Kamil Trzciński2016-12-181-3/+2
|\ \
| * | Correct slack slash commands pretty pathcorrect-slack-slash-commands-pretty-pathLuke "Jared" Bennett2016-12-151-3/+2
* | | Merge branch 'feature/runner-script-attempts-docs' into 'master' Kamil Trzciński2016-12-183-0/+29
|\ \ \
| * | | Add detailed docs in yaml README [ci skip]feature/runner-script-attempts-docsJames Lopez2016-12-161-0/+25
| * | | add new runner script attempts docs and update .gitlab-ci.ymlJames Lopez2016-12-152-0/+4
* | | | Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into...Sean McGivern2016-12-1721-44/+45
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | 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
View Lorry Controller Status