Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config | Kamil Trzcinski | 2016-12-20 | 50 | -254/+752 |
|\ | |||||
| * | Merge branch '25848-fix-git-rev-list-env-parsing' into 'master' | Sean McGivern | 2016-12-20 | 1 | -0/+7 |
| |\ | |||||
| | * | Reject blank environment vcariables in Gitlab::Git::RevList25848-fix-git-rev-list-env-parsing | Rémy Coutable | 2016-12-20 | 1 | -0/+7 |
| * | | Merge branch 'zj-kamil-slack-slash-commands' into 'master' | Grzegorz Bizon | 2016-12-20 | 19 | -167/+260 |
| |\ \ | | |/ | |/| | |||||
| | * | Fix specszj-kamil-slack-slash-commands | Kamil Trzcinski | 2016-12-19 | 1 | -22/+14 |
| | * | Improve after feedback | Kamil Trzcinski | 2016-12-19 | 4 | -14/+16 |
| | * | Fix previously reverted spec failures | Kamil Trzcinski | 2016-12-19 | 7 | -47/+47 |
| | * | Fix failures | Kamil Trzcinski | 2016-12-18 | 1 | -1/+1 |
| | * | Fix spec failures | Kamil Trzcinski | 2016-12-18 | 3 | -3/+4 |
| | * | Remove not related spec changes | Kamil Trzcinski | 2016-12-18 | 6 | -43/+43 |
| | * | Added slack slash commands frontend help well | Luke "Jared" Bennett | 2016-12-18 | 1 | -0/+48 |
| | * | Use Slack::Notifier::LinkFormatter to convert markdown links to slack compat | Kamil Trzcinski | 2016-12-16 | 7 | -23/+42 |
| | * | Fix SlackSlashCommands tests | Kamil Trzcinski | 2016-12-16 | 5 | -115/+124 |
| | * | Create Slack Slash command service | Z.J. van de Weg | 2016-12-16 | 7 | -45/+67 |
| * | | Merge branch 'fix-forbidden-for-build-api-for-deleted-project' into 'master' | Grzegorz Bizon | 2016-12-20 | 1 | -2/+18 |
| |\ \ | |||||
| | * | | Spaces around literal hash | Lin Jen-Shin | 2016-12-19 | 1 | -2/+2 |
| | * | | Just set the status rather than calling event | Lin Jen-Shin | 2016-12-19 | 1 | -5/+2 |
| | * | | Define actions in let so that it could be overridden | Lin Jen-Shin | 2016-12-19 | 1 | -10/+13 |
| | * | | Delete the project when building the build | Lin Jen-Shin | 2016-12-19 | 1 | -10/+7 |
| | * | | Merge remote-tracking branch 'upstream/master' into fix-forbidden-for-build-a... | Lin Jen-Shin | 2016-12-19 | 133 | -491/+2989 |
| | |\ \ | |||||
| | * | | | Give forbidden if project for the build was deleted | Lin Jen-Shin | 2016-12-15 | 1 | -0/+19 |
| * | | | | Merge branch 'dz-fix-route-rename' into 'master' | Douglas Barbosa Alexandre | 2016-12-19 | 1 | -3/+5 |
| |\ \ \ \ | |||||
| | * | | | | Fix Route#rename_children behaviordz-fix-route-rename | Dmitriy Zaporozhets | 2016-12-19 | 1 | -3/+5 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'bb-wiki-import' into 'master' | Douglas Barbosa Alexandre | 2016-12-19 | 3 | -4/+60 |
| |\ \ \ \ | |||||
| | * | | | | Add Wiki import to BB importer | Valery Sizov | 2016-12-19 | 3 | -4/+60 |
| * | | | | | Merge branch 'ldap_maint_task' into 'master' | Nick Thomas | 2016-12-19 | 1 | -0/+13 |
| |\ \ \ \ \ | |||||
| | * | | | | | Add LDAP task to rename a provider | Drew Blessing | 2016-12-16 | 1 | -0/+13 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge branch 'move-admin-appearance-feature-to-rspec' into 'master' | Rémy Coutable | 2016-12-19 | 1 | -0/+76 |
| |\ \ \ \ \ | |||||
| | * | | | | | Move Admin Appearance spinach feature to rspec | jurre | 2016-12-19 | 1 | -0/+76 |
| * | | | | | | Merge branch 'pipeline-build-hitbox' into 'master' | Annabel Dunstone Gray | 2016-12-19 | 2 | -23/+19 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Make CI badge hitboxes better match container | Mitchell Hentges | 2016-12-19 | 2 | -23/+19 |
| * | | | | | | | Merge branch 'move-admin-broadcast-message-feature-to-rspec' into 'master' | Rémy Coutable | 2016-12-19 | 1 | -0/+51 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Move admin broadcast messages spinach feature to rspec | jurre | 2016-12-19 | 1 | -0/+51 |
| | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'fix-yaml-variables' into 'master' | Grzegorz Bizon | 2016-12-19 | 4 | -16/+48 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | Fix tests because now we don't convert valuesfix-yaml-variables | Lin Jen-Shin | 2016-12-19 | 1 | -2/+2 |
| | * | | | | | | Spaces for literal hash | Lin Jen-Shin | 2016-12-19 | 1 | -1/+1 |
| | * | | | | | | Test if expanded_environment_name could expand var | Lin Jen-Shin | 2016-12-19 | 1 | -2/+16 |
| | * | | | | | | Merge branch 'master' into fix-yaml-variables | Lin Jen-Shin | 2016-12-19 | 131 | -491/+2917 |
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | |||||
| | * | | | | | | Rename to Gitlab::Serialize::Ci::Variables | Lin Jen-Shin | 2016-12-16 | 1 | -1/+1 |
| | * | | | | | | Use described_class | Lin Jen-Shin | 2016-12-16 | 1 | -2/+1 |
| | * | | | | | | Just use YAML.safe_load and assume the format | Lin Jen-Shin | 2016-12-15 | 1 | -21/+0 |
| | * | | | | | | Strictly check the type loaded from YAML | Lin Jen-Shin | 2016-12-15 | 1 | -0/+21 |
| | * | | | | | | Convert CI YAML variables keys into strings | Lin Jen-Shin | 2016-12-15 | 4 | -14/+33 |
| | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Merge branch 'fix/import-export-mr-error' into 'master' | Rémy Coutable | 2016-12-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix MR issue to do with merge user | James Lopez | 2016-12-19 | 1 | -1/+1 |
| | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Merge branch 'fix/import-export-ee-services' into 'master' | Rémy Coutable | 2016-12-19 | 1 | -0/+22 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix for missing service when importing from EE to CEfix/import-export-ee-services | James Lopez | 2016-12-19 | 1 | -0/+22 |
| * | | | | | | | Merge branch '25761-fix-blame-500' into 'master' | Sean McGivern | 2016-12-19 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | Fix 500 error for invalid path when visiting blame page | Jeff Stubler | 2016-12-17 | 1 | -0/+5 |
| * | | | | | | | Merge branch 'move-admin-label-spinach-test-to-rspec' into 'master' | Rémy Coutable | 2016-12-19 | 1 | -0/+99 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | |