Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge two methods. | Hiroyuki Sato | 2016-12-20 | 1 | -5/+5 |
* | Add a blank line before first expect. | Hiroyuki Sato | 2016-12-20 | 1 | -0/+1 |
* | Clean-up spec | Hiroyuki Sato | 2016-12-20 | 1 | -10/+4 |
* | Add specs. | Hiroyuki Sato | 2016-12-20 | 1 | -0/+21 |
* | 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 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Move admin labels spinach test to rspec | Semyon Pupkov | 2016-12-19 | 1 | -0/+99 |
* | | | | | | | Merge branch 'fix/import-export-build-token' into 'master' | Grzegorz Bizon | 2016-12-19 | 2 | -1/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | updated spec | James Lopez | 2016-12-19 | 1 | -2/+2 |
| * | | | | | | | Fix duplicated build token problem and added relevant specfix/import-export-build-token | James Lopez | 2016-12-19 | 2 | -1/+11 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'fix/detailed-status-groups' into 'master' | Lin Jen-Shin (godfat) | 2016-12-19 | 13 | -1/+57 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Fix CI/CD statuses actions' CSS on pipeline graphs | Grzegorz Bizon | 2016-12-17 | 1 | -1/+1 |
| * | | | | | | Update status group name for success with warnings | Grzegorz Bizon | 2016-12-16 | 1 | -0/+4 |
| * | | | | | | Make CI/CD detailed status group concept explicit | Grzegorz Bizon | 2016-12-16 | 11 | -0/+52 |
* | | | | | | | Merge branch '25301-git-2.11-force-push-bug' into 'master' | Douglas Barbosa Alexandre | 2016-12-19 | 2 | -0/+72 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Implement final review comments from @rymai.25301-git-2.11-force-push-bug | Timothy Andrew | 2016-12-16 | 1 | -44/+21 |