Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix rspec tests due to different API | Z.J. van de Weg | 2016-12-20 | 1 | -2/+2 |
* | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ... | Z.J. van de Weg | 2016-12-20 | 2 | -8/+35 |
|\ | |||||
| * | Add missing Mattermost::Error | Kamil Trzcinski | 2016-12-20 | 1 | -0/+3 |
| * | Add with_lease to session [ci skip] | Kamil Trzcinski | 2016-12-20 | 1 | -8/+32 |
* | | Fix rubocop errors [ci skip] | Z.J. van de Weg | 2016-12-20 | 1 | -1/+1 |
|/ | |||||
* | WIP | Kamil Trzcinski | 2016-12-20 | 2 | -14/+14 |
* | Work on tests for mattermost | Kamil Trzcinski | 2016-12-20 | 2 | -3/+17 |
* | Fix Mattermost client | Kamil Trzcinski | 2016-12-20 | 1 | -1/+1 |
* | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config | Kamil Trzcinski | 2016-12-20 | 20 | -43/+159 |
|\ | |||||
| * | Merge branch '25848-fix-git-rev-list-env-parsing' into 'master' | Sean McGivern | 2016-12-20 | 1 | -2/+2 |
| |\ | |||||
| | * | Reject blank environment vcariables in Gitlab::Git::RevList25848-fix-git-rev-list-env-parsing | Rémy Coutable | 2016-12-20 | 1 | -2/+2 |
| * | | Merge branch 'zj-kamil-slack-slash-commands' into 'master' | Grzegorz Bizon | 2016-12-20 | 5 | -12/+23 |
| |\ \ | | |/ | |/| | |||||
| | * | Improve after feedback | Kamil Trzcinski | 2016-12-19 | 3 | -30/+9 |
| | * | Fix Rubocop | Kamil Trzcinski | 2016-12-18 | 1 | -2/+2 |
| | * | Use Slack::Notifier::LinkFormatter to convert markdown links to slack compat | Kamil Trzcinski | 2016-12-16 | 2 | -23/+4 |
| | * | Fix SlackSlashCommands tests | Kamil Trzcinski | 2016-12-16 | 1 | -1/+1 |
| | * | Fix specs | Kamil Trzcinski | 2016-12-16 | 2 | -5/+10 |
| | * | Render format dependent links | Kamil Trzcinski | 2016-12-16 | 3 | -97/+113 |
| | * | Use Slack compatible syntax | Kamil Trzcinski | 2016-12-16 | 1 | -4/+4 |
| | * | Rename Mattermost::Presenter to Presenter | Kamil Trzcinski | 2016-12-16 | 2 | -131/+133 |
| | * | Create Slack Slash command service | Z.J. van de Weg | 2016-12-16 | 3 | -1/+29 |
| * | | Merge branch 'fix-forbidden-for-build-api-for-deleted-project' into 'master' | Grzegorz Bizon | 2016-12-20 | 2 | -15/+19 |
| |\ \ | |||||
| | * | | Use a block to insert extra check for authenticate_build!fix-forbidden-for-build-api-for-deleted-project | Lin Jen-Shin | 2016-12-20 | 1 | -3/+6 |
| | * | | Prefer unless over if not | Lin Jen-Shin | 2016-12-19 | 1 | -1/+1 |
| | * | | Use a separate method to skip validation | Lin Jen-Shin | 2016-12-19 | 2 | -3/+8 |
| | * | | Merge remote-tracking branch 'upstream/master' into fix-forbidden-for-build-a... | Lin Jen-Shin | 2016-12-19 | 55 | -303/+1361 |
| | |\ \ | |||||
| | * | | | Give forbidden if project for the build was deleted | Lin Jen-Shin | 2016-12-15 | 2 | -15/+11 |
| * | | | | Merge branch 'bb-wiki-import' into 'master' | Douglas Barbosa Alexandre | 2016-12-19 | 3 | -1/+25 |
| |\ \ \ \ | |||||
| | * | | | | Add Wiki import to BB importer | Valery Sizov | 2016-12-19 | 3 | -1/+25 |
| * | | | | | Merge branch 'ldap_maint_task' into 'master' | Nick Thomas | 2016-12-19 | 1 | -0/+40 |
| |\ \ \ \ \ | |||||
| | * | | | | | Add LDAP task to rename a provider | Drew Blessing | 2016-12-16 | 1 | -0/+40 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge branch 'fix-yaml-variables' into 'master' | Grzegorz Bizon | 2016-12-19 | 2 | -1/+28 |
| |\ \ \ \ \ | |||||
| | * | | | | | Keep the value type for YAML variables | Lin Jen-Shin | 2016-12-19 | 2 | -2/+1 |
| | * | | | | | Just implement it in the block | Lin Jen-Shin | 2016-12-19 | 1 | -9/+5 |
| | * | | | | | Merge branch 'master' into fix-yaml-variables | Lin Jen-Shin | 2016-12-19 | 48 | -293/+1290 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | * | | | | | Rename to Gitlab::Serialize::Ci::Variables | Lin Jen-Shin | 2016-12-16 | 2 | -31/+32 |
| | * | | | | | Just use YAML.safe_load and assume the format | Lin Jen-Shin | 2016-12-15 | 1 | -23/+3 |
| | * | | | | | Strictly check the type loaded from YAML | Lin Jen-Shin | 2016-12-15 | 1 | -3/+24 |
| | * | | | | | Convert CI YAML variables keys into strings | Lin Jen-Shin | 2016-12-15 | 2 | -1/+31 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | 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 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Fix for missing service when importing from EE to CEfix/import-export-ee-services | James Lopez | 2016-12-19 | 2 | -1/+8 |
| * | | | | | Merge branch 'fix/import-export-build-token' into 'master' | Grzegorz Bizon | 2016-12-19 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix duplicated build token problem and added relevant specfix/import-export-build-token | James Lopez | 2016-12-19 | 1 | -0/+2 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge branch 'fix/detailed-status-groups' into 'master' | Lin Jen-Shin (godfat) | 2016-12-19 | 4 | -10/+11 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Improve how we calculate detailed status group name | Grzegorz Bizon | 2016-12-16 | 1 | -1/+1 |
| | * | | | | Update status group name for success with warnings | Grzegorz Bizon | 2016-12-16 | 1 | -1/+1 |
| | * | | | | Make CI/CD detailed status group concept explicit | Grzegorz Bizon | 2016-12-16 | 3 | -8/+9 |
* | | | | | | Fix flow | Kamil Trzcinski | 2016-12-20 | 3 | -21/+46 |
* | | | | | | Improve sources | Kamil Trzcinski | 2016-12-19 | 3 | -7/+23 |