summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch '25225-fix-inconsistent-merge-button-styles' into 'master' Alfredo Sumaran2016-12-212-44/+27
* Merge branch 'update-nginx-config-for-websockets' into 'master' Kamil Trzciński2016-12-212-0/+15
* Merge branch '22864-kubernetes-deploy-with-terminal' into 'master' Kamil Trzciński2016-12-2150-68/+5805
* Merge branch 'fix-forbidden-for-build-api-for-deleted-project' into 'master' Grzegorz Bizon2016-12-213-17/+37
* Merge branch 'fix-yaml-variables' into 'master' Grzegorz Bizon2016-12-218-18/+81
* Merge branch 'project-authorizations-diff' into 'master' Nick Thomas2016-12-217-61/+364
* Merge branch 'remove-u2f-error-logging' into 'master' Alfredo Sumaran2016-12-216-5/+10
* Merge branch 'dockerfile-templates' into 'master' Rémy Coutable2016-12-2112-6/+138
* Merge branch 'doc-for-pipeline-duration' into 'master' Rémy Coutable2016-12-211-0/+31
* Merge branch '20492-access-token-scopes' into 'master'Rémy Coutable2016-12-210-0/+0
* Merge branch '25339-2-webhooks-fired-for-issue-closed-and-reopened' into 'mas...Rémy Coutable2016-12-210-0/+0
* Merge branch 'zj-kamil-slack-slash-commands' into 'master'Grzegorz Bizon2016-12-2137-241/+482
* Merge branch '22348-gitea-importer-docs' into 'master' Rémy Coutable2016-12-214-5/+85
* Merge branch '22348-gitea-importer' into 'master' Rémy Coutable2016-12-2139-657/+1357
* Merge branch 'fix/import-export-ee-services' into 'master' Rémy Coutable2016-12-214-1/+34
* Merge branch 'fix/import-export-mr-error' into 'master' Rémy Coutable2016-12-214-3/+7
* Merge branch 'bb-wiki-import' into 'master' Douglas Barbosa Alexandre2016-12-219-6/+88
* Merge branch 'gitlab-workhorse-1.2.1' into 'master' Rémy Coutable2016-12-211-1/+1
* Merge branch 'dz-rename-invalid-groups' into 'master' Douwe Maan2016-12-213-2/+88
* Merge branch '25895-fix-headers-in-ci-api-helpers' into 'master' Kamil Trzciński2016-12-213-1/+10
* Merge branch 'dz-whitelist-dashboard-project-path' into 'master' Douwe Maan2016-12-212-1/+6
* Update VERSION to 8.15.0-rc3v8.15.0-rc3Douglas Barbosa Alexandre2016-12-201-1/+1
* Merge branch 'fix/25843' into 'master'Sean McGivern2016-12-2013-27/+24
* Merge branch 'fix_team_member_expiration_date_spec' into 'master' Grzegorz Bizon2016-12-201-2/+2
* Merge branch 'dz-fix-route-rename' into 'master' Douglas Barbosa Alexandre2016-12-203-4/+10
* Merge branch '25848-fix-git-rev-list-env-parsing' into 'master' Sean McGivern2016-12-202-2/+9
* 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