Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dz-nested-groups-api' into 'master' | Dmitriy Zaporozhets | 2017-02-09 | 5 | -3/+27 |
|\ | |||||
| * | Add nested groups to the APIdz-nested-groups-api | Dmitriy Zaporozhets | 2017-02-08 | 5 | -3/+27 |
* | | Merge branch 'docs/omniauth-fix-link' into 'master' | Achilleas Pipinellis | 2017-02-09 | 11 | -11/+11 |
|\ \ | |||||
| * | | Fix markdown link in Omniauth docs | Achilleas Pipinellis | 2017-02-09 | 11 | -11/+11 |
|/ / | |||||
* | | Merge branch 'docs/omniauth-restart' into 'master' | Achilleas Pipinellis | 2017-02-09 | 11 | -32/+73 |
|\ \ | |||||
| * | | Mention reconfigure/restart in omniauth docs | Achilleas Pipinellis | 2017-02-09 | 11 | -32/+73 |
|/ / | |||||
* | | Merge branch 'dm-add-column-with-default-cop' into 'master' | Douwe Maan | 2017-02-09 | 7 | -8/+97 |
|\ \ | |||||
| * | | Migration does not require downtime | Douwe Maan | 2017-02-08 | 1 | -0/+2 |
| * | | Satisfy the new rubocop :) | Douwe Maan | 2017-02-08 | 2 | -2/+10 |
| * | | Explicitly require rubocop migration_helpersdm-add-column-with-default-cop | Douwe Maan | 2017-02-08 | 3 | -1/+4 |
| * | | Add cop that checks if add_column_with_default is used with up/down methods | Douwe Maan | 2017-02-08 | 5 | -5/+81 |
* | | | Merge branch 'feature-freeze-exceptions' into 'master' | Robert Speicher | 2017-02-09 | 1 | -10/+28 |
|\ \ \ | |||||
| * | | | Add an ordered list with the 3 people who need to sign off | Douwe Maan | 2017-02-08 | 1 | -2/+8 |
| * | | | Rephrase some thingsfeature-freeze-exceptions | Douwe Maan | 2017-02-08 | 1 | -10/+12 |
| * | | | Too many releases | Douwe Maan | 2017-02-08 | 1 | -1/+1 |
| * | | | Small rephrase | Douwe Maan | 2017-02-08 | 1 | -1/+1 |
| * | | | Describe process around cherry-picking during the feature freeze | Douwe Maan | 2017-02-08 | 1 | -9/+19 |
| |/ / | |||||
* | | | Merge branch 'remove-jquery-ui-datepicker' into 'master' | Jacob Schatz | 2017-02-08 | 20 | -224/+183 |
|\ \ \ | |||||
| * | | | Changed date check testremove-jquery-ui-datepicker | Phil Hughes | 2017-02-06 | 6 | -31/+29 |
| * | | | Fixed missing edit link click | Phil Hughes | 2017-02-06 | 2 | -2/+3 |
| * | | | Fixed some specs | Phil Hughes | 2017-02-06 | 8 | -36/+38 |
| * | | | Updated styles for Pikaday | Phil Hughes | 2017-02-06 | 8 | -172/+73 |
| * | | | Replaced more jQuery UI datepickers | Phil Hughes | 2017-02-06 | 6 | -25/+70 |
| * | | | Removed jQuery UI datepicker | Phil Hughes | 2017-02-06 | 7 | -14/+26 |
* | | | | Merge branch 'remove-jquery-ui-sortable' into 'master' | Jacob Schatz | 2017-02-08 | 19 | -135/+160 |
|\ \ \ \ | |||||
| * | | | | Removed jQuery UI sortableremove-jquery-ui-sortable | Phil Hughes | 2017-02-06 | 19 | -135/+160 |
| |/ / / | |||||
* | | | | Merge branch 'dz-fix-route-rename-descendants' into 'master' | Dmitriy Zaporozhets | 2017-02-08 | 2 | -11/+28 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Fix route rename descendants if route.name is blank | Dmitriy Zaporozhets | 2017-02-08 | 2 | -11/+28 |
* | | | | Merge branch 'bypass-whitelist-for-external-user' into 'master' | Robert Speicher | 2017-02-08 | 4 | -4/+36 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Bypass signup domain validation for external users | Reza Mohammadi | 2017-02-08 | 4 | -4/+36 |
* | | | | Merge branch 'mr-widget-pipelines' into 'master' | Fatih Acet | 2017-02-08 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | Reduce padding of mr widget mini graph | Annabel Dunstone Gray | 2017-02-08 | 1 | -0/+6 |
* | | | | | Merge branch '27756-fix-json-404-response' into 'master' | Clement Ho | 2017-02-08 | 4 | -5/+28 |
|\ \ \ \ \ | |||||
| * | | | | | Remove sleep from tests | Clement Ho | 2017-02-08 | 1 | -2/+0 |
| * | | | | | Add tests27756-fix-json-404-response | Alfredo Sumaran | 2017-02-07 | 2 | -1/+25 |
| * | | | | | Fixes ajax requests when current URL has a trailing slash | Alfredo Sumaran | 2017-02-07 | 3 | -5/+6 |
* | | | | | | Merge branch '27880-pipelines-table-not-showing-commit-branch' into 'master' | Clement Ho | 2017-02-08 | 3 | -3/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Looks for correct key to pass to commit prop. Adds rspec test. | Filipa Lacerda | 2017-02-08 | 3 | -3/+11 |
* | | | | | | | Merge branch 'dz-refactor-full-path' into 'master' | Dmitriy Zaporozhets | 2017-02-08 | 16 | -98/+191 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Store group and project full name and full path in routes tabledz-refactor-full-path | Dmitriy Zaporozhets | 2017-02-08 | 16 | -98/+191 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'widget-spec-failure' into 'master' | Sean McGivern | 2017-02-08 | 1 | -2/+0 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Fixed random merge request widget failure | Phil Hughes | 2017-02-08 | 1 | -2/+0 |
* | | | | | | | Merge branch 'rename_delete_services' into 'master' | Rémy Coutable | 2017-02-08 | 19 | -86/+89 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix inconsistent naming for services that delete things | dixpac | 2017-02-08 | 19 | -86/+89 |
* | | | | | | | | Merge branch 'minigraph-fix' into 'master' | Filipa Lacerda | 2017-02-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Listens on document for mini-pipeline graphminigraph-fix | Phil Hughes | 2017-02-08 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'backport-ee-build-fixes' into 'master' | Filipa Lacerda | 2017-02-08 | 3 | -1/+15 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | backport fixes for pipelines_store frontend specsbackport-ee-build-fixes | Mike Greiling | 2017-02-08 | 3 | -1/+15 |
* | | | | | | | | Merge branch 'patch-12' into 'master' | Rémy Coutable | 2017-02-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix link in CONTRIBUTING.md | Carlos Galarza | 2017-01-28 | 1 | -1/+1 |