summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge two methods.Hiroyuki Sato2016-12-201-5/+5
* Add a blank line before first expect.Hiroyuki Sato2016-12-201-0/+1
* Clean-up specHiroyuki Sato2016-12-201-10/+4
* Add specs.Hiroyuki Sato2016-12-201-0/+21
* Merge branch 'fix-forbidden-for-build-api-for-deleted-project' into 'master' Grzegorz Bizon2016-12-201-2/+18
|\
| * Spaces around literal hashLin Jen-Shin2016-12-191-2/+2
| * Just set the status rather than calling eventLin Jen-Shin2016-12-191-5/+2
| * Define actions in let so that it could be overriddenLin Jen-Shin2016-12-191-10/+13
| * Delete the project when building the buildLin Jen-Shin2016-12-191-10/+7
| * Merge remote-tracking branch 'upstream/master' into fix-forbidden-for-build-a...Lin Jen-Shin2016-12-19133-491/+2989
| |\
| * | Give forbidden if project for the build was deletedLin Jen-Shin2016-12-151-0/+19
* | | Merge branch 'dz-fix-route-rename' into 'master' Douglas Barbosa Alexandre2016-12-191-3/+5
|\ \ \
| * | | Fix Route#rename_children behaviordz-fix-route-renameDmitriy Zaporozhets2016-12-191-3/+5
| | |/ | |/|
* | | Merge branch 'bb-wiki-import' into 'master' Douglas Barbosa Alexandre2016-12-193-4/+60
|\ \ \
| * | | Add Wiki import to BB importerValery Sizov2016-12-193-4/+60
* | | | Merge branch 'ldap_maint_task' into 'master' Nick Thomas2016-12-191-0/+13
|\ \ \ \
| * | | | Add LDAP task to rename a providerDrew Blessing2016-12-161-0/+13
* | | | | 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