summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-2050-254/+752
|\
| * Merge branch '25848-fix-git-rev-list-env-parsing' into 'master' Sean McGivern2016-12-201-0/+7
| |\
| | * Reject blank environment vcariables in Gitlab::Git::RevList25848-fix-git-rev-list-env-parsingRémy Coutable2016-12-201-0/+7
| * | Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-2019-167/+260
| |\ \ | | |/ | |/|
| | * Fix specszj-kamil-slack-slash-commandsKamil Trzcinski2016-12-191-22/+14
| | * Improve after feedbackKamil Trzcinski2016-12-194-14/+16
| | * Fix previously reverted spec failuresKamil Trzcinski2016-12-197-47/+47
| | * Fix failuresKamil Trzcinski2016-12-181-1/+1
| | * Fix spec failuresKamil Trzcinski2016-12-183-3/+4
| | * Remove not related spec changesKamil Trzcinski2016-12-186-43/+43
| | * Added slack slash commands frontend help wellLuke "Jared" Bennett2016-12-181-0/+48
| | * Use Slack::Notifier::LinkFormatter to convert markdown links to slack compatKamil Trzcinski2016-12-167-23/+42
| | * Fix SlackSlashCommands testsKamil Trzcinski2016-12-165-115/+124
| | * Create Slack Slash command serviceZ.J. van de Weg2016-12-167-45/+67
| * | Merge branch 'fix-forbidden-for-build-api-for-deleted-project' into 'master' Grzegorz Bizon2016-12-201-2/+18
| |\ \
| | * | Spaces around literal hashLin Jen-Shin2016-12-191-2/+2
| | * | Just set the status rather than calling eventLin Jen-Shin2016-12-191-5/+2
| | * | Define actions in let so that it could be overriddenLin Jen-Shin2016-12-191-10/+13
| | * | Delete the project when building the buildLin Jen-Shin2016-12-191-10/+7
| | * | Merge remote-tracking branch 'upstream/master' into fix-forbidden-for-build-a...Lin Jen-Shin2016-12-19133-491/+2989
| | |\ \
| | * | | Give forbidden if project for the build was deletedLin Jen-Shin2016-12-151-0/+19
| * | | | Merge branch 'dz-fix-route-rename' into 'master' Douglas Barbosa Alexandre2016-12-191-3/+5
| |\ \ \ \
| | * | | | Fix Route#rename_children behaviordz-fix-route-renameDmitriy Zaporozhets2016-12-191-3/+5
| | | |/ / | | |/| |
| * | | | Merge branch 'bb-wiki-import' into 'master' Douglas Barbosa Alexandre2016-12-193-4/+60
| |\ \ \ \
| | * | | | Add Wiki import to BB importerValery Sizov2016-12-193-4/+60
| * | | | | Merge branch 'ldap_maint_task' into 'master' Nick Thomas2016-12-191-0/+13
| |\ \ \ \ \
| | * | | | | Add LDAP task to rename a providerDrew Blessing2016-12-161-0/+13
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'move-admin-appearance-feature-to-rspec' into 'master' Rémy Coutable2016-12-191-0/+76
| |\ \ \ \ \
| | * | | | | Move Admin Appearance spinach feature to rspecjurre2016-12-191-0/+76
| * | | | | | Merge branch 'pipeline-build-hitbox' into 'master' Annabel Dunstone Gray2016-12-192-23/+19
| |\ \ \ \ \ \
| | * | | | | | Make CI badge hitboxes better match containerMitchell Hentges2016-12-192-23/+19
| * | | | | | | Merge branch 'move-admin-broadcast-message-feature-to-rspec' into 'master' Rémy Coutable2016-12-191-0/+51
| |\ \ \ \ \ \ \
| | * | | | | | | Move admin broadcast messages spinach feature to rspecjurre2016-12-191-0/+51
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'fix-yaml-variables' into 'master' Grzegorz Bizon2016-12-194-16/+48
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | 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
| | * | | | | | Test if expanded_environment_name could expand varLin Jen-Shin2016-12-191-2/+16
| | * | | | | | Merge branch 'master' into fix-yaml-variablesLin Jen-Shin2016-12-19131-491/+2917
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | * | | | | | Rename to Gitlab::Serialize::Ci::VariablesLin Jen-Shin2016-12-161-1/+1
| | * | | | | | Use described_classLin Jen-Shin2016-12-161-2/+1
| | * | | | | | Just use YAML.safe_load and assume the formatLin Jen-Shin2016-12-151-21/+0
| | * | | | | | Strictly check the type loaded from YAMLLin Jen-Shin2016-12-151-0/+21
| | * | | | | | Convert CI YAML variables keys into stringsLin Jen-Shin2016-12-154-14/+33
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'fix/import-export-mr-error' into 'master' Rémy Coutable2016-12-191-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fix MR issue to do with merge userJames Lopez2016-12-191-1/+1
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'fix/import-export-ee-services' into 'master' Rémy Coutable2016-12-191-0/+22
| |\ \ \ \ \ \
| | * | | | | | Fix for missing service when importing from EE to CEfix/import-export-ee-servicesJames Lopez2016-12-191-0/+22
| * | | | | | | Merge branch '25761-fix-blame-500' into 'master' Sean McGivern2016-12-191-0/+5
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Fix 500 error for invalid path when visiting blame pageJeff Stubler2016-12-171-0/+5
| * | | | | | | Merge branch 'move-admin-label-spinach-test-to-rspec' into 'master' Rémy Coutable2016-12-191-0/+99
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |