summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Move admin labels spinach test to rspecSemyon Pupkov2016-12-191-0/+99
* | | | | | Merge branch 'fix/import-export-build-token' into 'master' Grzegorz Bizon2016-12-192-1/+11
|\ \ \ \ \ \
| * | | | | | updated specJames Lopez2016-12-191-2/+2
| * | | | | | Fix duplicated build token problem and added relevant specfix/import-export-build-tokenJames Lopez2016-12-192-1/+11
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fix/detailed-status-groups' into 'master' Lin Jen-Shin (godfat)2016-12-1913-1/+57
|\ \ \ \ \ \
| * | | | | | Fix CI/CD statuses actions' CSS on pipeline graphsGrzegorz Bizon2016-12-171-1/+1
| * | | | | | Update status group name for success with warningsGrzegorz Bizon2016-12-161-0/+4
| * | | | | | Make CI/CD detailed status group concept explicitGrzegorz Bizon2016-12-1611-0/+52
* | | | | | | Merge branch '25301-git-2.11-force-push-bug' into 'master' Douglas Barbosa Alexandre2016-12-192-0/+72
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Implement final review comments from @rymai.25301-git-2.11-force-push-bugTimothy Andrew2016-12-161-44/+21
| * | | | | | Implement review comments from @dbalexandre.Timothy Andrew2016-12-162-69/+45
| * | | | | | Check the exit code while invoking git in the force push check.Timothy Andrew2016-12-161-0/+19
| * | | | | | Validate environment variables in `Gitlab::Git::RevList`Timothy Andrew2016-12-162-0/+100
* | | | | | | Merge branch 'dockerfile-templates' into 'master' Rémy Coutable2016-12-191-0/+30
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into dockerfile-templatesdockerfile-templatesKamil Trzcinski2016-12-18613-5732/+21897
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Refactored JSLuke "Jared" Bennett2016-11-081-0/+30
* | | | | | | | Merge branch 'move-admin-application-spinach-test-to-rspec' into 'master' Rémy Coutable2016-12-191-0/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | Move admin application spinach test to rspecSemyon Pupkov2016-12-171-0/+36
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'deploy-keys-to-rspec' into 'master' Rémy Coutable2016-12-191-0/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | Move admin deploy keys spinach test to rspecSemyon Pupkov2016-12-171-0/+29
| |/ / / / / / /
* | | | | | | | Always use `fixture_file_upload` helper to upload files in tests.fix-groups-helper-specRuben Davila2016-12-181-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into...Sean McGivern2016-12-172-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741Rydkin Maxim2016-12-162-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Store mattermost_url in settingsKamil Trzcinski2016-12-171-5/+13
* | | | | | Improve Mattermost Session specsKamil Trzcinski2016-12-171-15/+38
* | | | | | Improve session testsZ.J. van de Weg2016-12-172-42/+68
* | | | | | Setup mattermost sessionZ.J. van de Weg2016-12-171-0/+42