Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix member with expiration date feature specfix_team_member_expiration_date_spec | Felipe Artur | 2016-12-19 | 1 | -2/+2 |
* | Merge branch 'bb-wiki-import' into 'master' | Douglas Barbosa Alexandre | 2016-12-19 | 9 | -6/+88 |
|\ | |||||
| * | Add Wiki import to BB importer | Valery Sizov | 2016-12-19 | 9 | -6/+88 |
* | | Merge branch 'ldap_maint_task' into 'master' | Nick Thomas | 2016-12-19 | 6 | -22/+181 |
|\ \ | |||||
| * | | Add LDAP task to rename a provider | Drew Blessing | 2016-12-16 | 6 | -22/+181 |
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Douglas Barbosa Alexandre | 2016-12-19 | 0 | -0/+0 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Douglas Barbosa Alexandre | 2016-12-19 | 9 | -33/+22 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Douglas Barbosa Alexandre | 2016-12-19 | 9 | -33/+22 |
| | |\ \ \ | |||||
| | | * | | | Update CHANGELOG.md for 8.13.10 | Alejandro Rodríguez | 2016-12-14 | 1 | -0/+7 |
| | | * | | | Update CHANGELOG.md for 8.14.5 | Alejandro Rodríguez | 2016-12-14 | 9 | -33/+15 |
* | | | | | | Update CHANGELOG.md for 8.13.10 | Alejandro Rodríguez | 2016-12-19 | 1 | -0/+7 |
* | | | | | | Update CHANGELOG.md for 8.14.5 | Alejandro Rodríguez | 2016-12-19 | 9 | -33/+15 |
* | | | | | | Merge branch 'move-admin-appearance-feature-to-rspec' into 'master' | Rémy Coutable | 2016-12-19 | 4 | -113/+76 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Move Admin Appearance spinach feature to rspec | jurre | 2016-12-19 | 4 | -113/+76 |
* | | | | | | | Merge branch 'leave-project-btn' into 'master' | Fatih Acet | 2016-12-19 | 14 | -59/+53 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Bring back "notification-dropdown" class for styling and use "js-notification...leave-project-btn | Adam Niedzielski | 2016-12-18 | 2 | -2/+2 |
| * | | | | | | Add sentence casing, fix groups page buttons, fix dark gray variable | Annabel Dunstone Gray | 2016-12-17 | 6 | -14/+5 |
| * | | | | | | Add empty koding state; check permissions for project buttons | Annabel Dunstone Gray | 2016-12-17 | 4 | -16/+14 |
| * | | | | | | Move all project buttons to header | Annabel Dunstone Gray | 2016-12-17 | 9 | -33/+29 |
| * | | | | | | Move access request buttons to project header | Annabel Dunstone Gray | 2016-12-17 | 5 | -18/+27 |
* | | | | | | | Merge branch 'pipeline-build-hitbox' into 'master' | Annabel Dunstone Gray | 2016-12-19 | 7 | -76/+68 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make CI badge hitboxes better match container | Mitchell Hentges | 2016-12-19 | 7 | -76/+68 |
* | | | | | | | | Merge branch 'move-admin-broadcast-message-feature-to-rspec' into 'master' | Rémy Coutable | 2016-12-19 | 3 | -99/+51 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Move admin broadcast messages spinach feature to rspec | jurre | 2016-12-19 | 3 | -99/+51 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'gl-dropdown-fix' into 'master' | Alfredo Sumaran | 2016-12-19 | 1 | -3/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Check if selected object is valid before passing to calbackgl-dropdown-fix | Alfredo Sumaran | 2016-12-19 | 1 | -3/+5 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'fix-yaml-variables' into 'master' | Grzegorz Bizon | 2016-12-19 | 8 | -18/+81 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | 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 |
| * | | | | | | | Keep the value type for YAML variables | Lin Jen-Shin | 2016-12-19 | 2 | -2/+1 |
| * | | | | | | | Test if expanded_environment_name could expand var | Lin Jen-Shin | 2016-12-19 | 1 | -2/+16 |
| * | | | | | | | Just implement it in the block | Lin Jen-Shin | 2016-12-19 | 1 | -9/+5 |
| * | | | | | | | Merge branch 'master' into fix-yaml-variables | Lin Jen-Shin | 2016-12-19 | 735 | -2798/+17939 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Rename to Gitlab::Serialize::Ci::Variables | Lin Jen-Shin | 2016-12-16 | 4 | -33/+34 |
| * | | | | | | | 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 | 2 | -44/+3 |
| * | | | | | | | Strictly check the type loaded from YAML | Lin Jen-Shin | 2016-12-15 | 2 | -3/+45 |
| * | | | | | | | Convert CI YAML variables keys into strings | Lin Jen-Shin | 2016-12-15 | 8 | -16/+69 |
* | | | | | | | | Merge branch 'fix/import-export-mr-error' into 'master' | Rémy Coutable | 2016-12-19 | 4 | -3/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix MR issue to do with merge user | James Lopez | 2016-12-19 | 4 | -3/+7 |
* | | | | | | | | | Merge branch 'fix/import-export-ee-services' into 'master' | Rémy Coutable | 2016-12-19 | 4 | -1/+34 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix for missing service when importing from EE to CEfix/import-export-ee-services | James Lopez | 2016-12-19 | 4 | -1/+34 |
* | | | | | | | | | | Merge branch '25761-fix-blame-500' into 'master' | Sean McGivern | 2016-12-19 | 3 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fix 500 error for invalid path when visiting blame page | Jeff Stubler | 2016-12-17 | 3 | -0/+12 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'update-gitlab-shell-4-1-1' into 'master' | Douglas Barbosa Alexandre | 2016-12-19 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | Bump gitlab-shell to 4.1.1update-gitlab-shell-4-1-1 | Rémy Coutable | 2016-12-16 | 2 | -2/+2 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'move-admin-label-spinach-test-to-rspec' into 'master' | Rémy Coutable | 2016-12-19 | 3 | -155/+99 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Move admin labels spinach test to rspec | Semyon Pupkov | 2016-12-19 | 3 | -155/+99 |
* | | | | | | | | Merge branch 'fix/import-export-build-token' into 'master' | Grzegorz Bizon | 2016-12-19 | 4 | -1/+17 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | updated spec | James Lopez | 2016-12-19 | 1 | -2/+2 |