summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix member with expiration date feature specfix_team_member_expiration_date_specFelipe Artur2016-12-191-2/+2
* Merge branch 'bb-wiki-import' into 'master' Douglas Barbosa Alexandre2016-12-199-6/+88
|\
| * Add Wiki import to BB importerValery Sizov2016-12-199-6/+88
* | Merge branch 'ldap_maint_task' into 'master' Nick Thomas2016-12-196-22/+181
|\ \
| * | Add LDAP task to rename a providerDrew Blessing2016-12-166-22/+181
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDouglas Barbosa Alexandre2016-12-190-0/+0
|\ \ \
| * \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDouglas Barbosa Alexandre2016-12-199-33/+22
| |\ \ \
| | * \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDouglas Barbosa Alexandre2016-12-199-33/+22
| | |\ \ \
| | | * | | Update CHANGELOG.md for 8.13.10Alejandro Rodríguez2016-12-141-0/+7
| | | * | | Update CHANGELOG.md for 8.14.5Alejandro Rodríguez2016-12-149-33/+15
* | | | | | Update CHANGELOG.md for 8.13.10Alejandro Rodríguez2016-12-191-0/+7
* | | | | | Update CHANGELOG.md for 8.14.5Alejandro Rodríguez2016-12-199-33/+15
* | | | | | Merge branch 'move-admin-appearance-feature-to-rspec' into 'master' Rémy Coutable2016-12-194-113/+76
|\ \ \ \ \ \
| * | | | | | Move Admin Appearance spinach feature to rspecjurre2016-12-194-113/+76
* | | | | | | Merge branch 'leave-project-btn' into 'master' Fatih Acet2016-12-1914-59/+53
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Bring back "notification-dropdown" class for styling and use "js-notification...leave-project-btnAdam Niedzielski2016-12-182-2/+2
| * | | | | | Add sentence casing, fix groups page buttons, fix dark gray variableAnnabel Dunstone Gray2016-12-176-14/+5
| * | | | | | Add empty koding state; check permissions for project buttonsAnnabel Dunstone Gray2016-12-174-16/+14
| * | | | | | Move all project buttons to headerAnnabel Dunstone Gray2016-12-179-33/+29
| * | | | | | Move access request buttons to project headerAnnabel Dunstone Gray2016-12-175-18/+27
* | | | | | | Merge branch 'pipeline-build-hitbox' into 'master' Annabel Dunstone Gray2016-12-197-76/+68
|\ \ \ \ \ \ \
| * | | | | | | Make CI badge hitboxes better match containerMitchell Hentges2016-12-197-76/+68
* | | | | | | | Merge branch 'move-admin-broadcast-message-feature-to-rspec' into 'master' Rémy Coutable2016-12-193-99/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | Move admin broadcast messages spinach feature to rspecjurre2016-12-193-99/+51
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'gl-dropdown-fix' into 'master' Alfredo Sumaran2016-12-191-3/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Check if selected object is valid before passing to calbackgl-dropdown-fixAlfredo Sumaran2016-12-191-3/+5
| |/ / / / / / /
* | | | | | | | Merge branch 'fix-yaml-variables' into 'master' Grzegorz Bizon2016-12-198-18/+81
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | 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
| * | | | | | | Keep the value type for YAML variablesLin Jen-Shin2016-12-192-2/+1
| * | | | | | | Test if expanded_environment_name could expand varLin Jen-Shin2016-12-191-2/+16
| * | | | | | | Just implement it in the blockLin Jen-Shin2016-12-191-9/+5
| * | | | | | | Merge branch 'master' into fix-yaml-variablesLin Jen-Shin2016-12-19735-2798/+17939
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Rename to Gitlab::Serialize::Ci::VariablesLin Jen-Shin2016-12-164-33/+34
| * | | | | | | Use described_classLin Jen-Shin2016-12-161-2/+1
| * | | | | | | Just use YAML.safe_load and assume the formatLin Jen-Shin2016-12-152-44/+3
| * | | | | | | Strictly check the type loaded from YAMLLin Jen-Shin2016-12-152-3/+45
| * | | | | | | Convert CI YAML variables keys into stringsLin Jen-Shin2016-12-158-16/+69
* | | | | | | | Merge branch 'fix/import-export-mr-error' into 'master' Rémy Coutable2016-12-194-3/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix MR issue to do with merge userJames Lopez2016-12-194-3/+7
* | | | | | | | | Merge branch 'fix/import-export-ee-services' into 'master' Rémy Coutable2016-12-194-1/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix for missing service when importing from EE to CEfix/import-export-ee-servicesJames Lopez2016-12-194-1/+34
* | | | | | | | | | Merge branch '25761-fix-blame-500' into 'master' Sean McGivern2016-12-193-0/+12
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Fix 500 error for invalid path when visiting blame pageJeff Stubler2016-12-173-0/+12
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'update-gitlab-shell-4-1-1' into 'master' Douglas Barbosa Alexandre2016-12-192-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Bump gitlab-shell to 4.1.1update-gitlab-shell-4-1-1Rémy Coutable2016-12-162-2/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'move-admin-label-spinach-test-to-rspec' into 'master' Rémy Coutable2016-12-193-155/+99
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Move admin labels spinach test to rspecSemyon Pupkov2016-12-193-155/+99
* | | | | | | | Merge branch 'fix/import-export-build-token' into 'master' Grzegorz Bizon2016-12-194-1/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | updated specJames Lopez2016-12-191-2/+2