Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | | | | | Implement review comments from @dbalexandre. | Timothy Andrew | 2016-12-16 | 2 | -69/+45 |
| * | | | | | | Check the exit code while invoking git in the force push check. | Timothy Andrew | 2016-12-16 | 1 | -0/+19 |
| * | | | | | | Validate environment variables in `Gitlab::Git::RevList` | Timothy Andrew | 2016-12-16 | 2 | -0/+100 |
* | | | | | | | Merge branch 'dockerfile-templates' into 'master' | Rémy Coutable | 2016-12-19 | 1 | -0/+30 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into dockerfile-templatesdockerfile-templates | Kamil Trzcinski | 2016-12-18 | 613 | -5732/+21897 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | Refactored JS | Luke "Jared" Bennett | 2016-11-08 | 1 | -0/+30 |
* | | | | | | | | Merge branch 'move-admin-application-spinach-test-to-rspec' into 'master' | Rémy Coutable | 2016-12-19 | 1 | -0/+36 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Move admin application spinach test to rspec | Semyon Pupkov | 2016-12-17 | 1 | -0/+36 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'deploy-keys-to-rspec' into 'master' | Rémy Coutable | 2016-12-19 | 1 | -0/+29 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Move admin deploy keys spinach test to rspec | Semyon Pupkov | 2016-12-17 | 1 | -0/+29 |
| |/ / / / / / / | |||||
* | | | | | | | | Always use `fixture_file_upload` helper to upload files in tests.fix-groups-helper-spec | Ruben Davila | 2016-12-18 | 1 | -1/+1 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into... | Sean McGivern | 2016-12-17 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741 | Rydkin Maxim | 2016-12-16 | 2 | -2/+2 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Store mattermost_url in settings | Kamil Trzcinski | 2016-12-17 | 1 | -5/+13 |
* | | | | | | Improve Mattermost Session specs | Kamil Trzcinski | 2016-12-17 | 1 | -15/+38 |
* | | | | | | Improve session tests | Z.J. van de Weg | 2016-12-17 | 2 | -42/+68 |
* | | | | | | Setup mattermost session | Z.J. van de Weg | 2016-12-17 | 1 | -0/+42 |