summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix tests because now we don't convert valuesfix-yaml-variablesLin Jen-Shin2016-12-191-2/+2
* Spaces for literal hashLin Jen-Shin2016-12-191-1/+1
* Keep the value type for YAML variablesLin Jen-Shin2016-12-192-2/+1
* Test if expanded_environment_name could expand varLin Jen-Shin2016-12-191-2/+16
* Just implement it in the blockLin Jen-Shin2016-12-191-9/+5
* Merge branch 'master' into fix-yaml-variablesLin Jen-Shin2016-12-19735-2798/+17939
|\
| * Merge branch 'dockerfile-templates' into 'master' Rémy Coutable2016-12-1912-6/+138
| |\
| | * Merge remote-tracking branch 'origin/master' into dockerfile-templatesdockerfile-templatesKamil Trzcinski2016-12-182868-35378/+79204
| | |\
| | * | Add CHANGELOGKamil Trzcinski2016-12-181-0/+4
| | * | Update templates.rbKamil Trzciński2016-12-161-1/+1
| | * | Refactored JSLuke "Jared" Bennett2016-11-087-42/+84
| | * | Allow to use Dockerfile templatesKamil Trzcinski2016-11-089-7/+93
| * | | Merge branch 'move-admin-application-spinach-test-to-rspec' into 'master' Rémy Coutable2016-12-194-77/+36
| |\ \ \
| | * | | Move admin application spinach test to rspecSemyon Pupkov2016-12-174-77/+36
| * | | | Merge branch 'deploy-keys-to-rspec' into 'master' Rémy Coutable2016-12-193-62/+29
| |\ \ \ \
| | * | | | Move admin deploy keys spinach test to rspecSemyon Pupkov2016-12-173-62/+29
| | |/ / /
| * | | | 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
View Lorry Controller Status