Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rename_delete_services' into 'master' | Rémy Coutable | 2017-02-08 | 3 | -3/+3 |
|\ | |||||
| * | Fix inconsistent naming for services that delete things | dixpac | 2017-02-08 | 3 | -3/+3 |
* | | Merge branch '23104-remove-public-param-for-projects' into 'master' | Douwe Maan | 2017-02-08 | 1 | -15/+4 |
|\ \ | |||||
| * | | API: remove `public` param for projects | Toon Claes | 2017-02-07 | 1 | -15/+4 |
* | | | Merge branch 'feature/gb/paginated-environments-api' into 'master' | Rémy Coutable | 2017-02-08 | 2 | -1/+37 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into feature/gb/paginated-environments-api | Filipa Lacerda | 2017-02-07 | 27 | -219/+1431 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Add specs for standalone pagination for serializers | Grzegorz Bizon | 2017-02-06 | 1 | -0/+9 |
| * | | | Move serializers pagination class to separate module | Grzegorz Bizon | 2017-02-06 | 1 | -0/+27 |
| * | | | Rename `Gitlab::Serialize` module to reuse it later | Grzegorz Bizon | 2017-02-06 | 1 | -1/+1 |
* | | | | Merge branch 'jej-lint-scripts-and-config' into 'master'dz-nested-groups-docs | Douwe Maan | 2017-02-08 | 1 | -0/+25 |
|\ \ \ \ | |||||
| * | | | | CI runs lint on shell scripts in lib/supportjej-lint-scripts-and-config | James Edwards-Jones | 2017-02-07 | 1 | -0/+25 |
* | | | | | Use stricter regex anchorsroute-map-string-source | Douwe Maan | 2017-02-07 | 1 | -1/+1 |
* | | | | | Support a string source in the route map | Douwe Maan | 2017-02-07 | 1 | -17/+15 |
* | | | | | Merge branch 'route-map' into 'master' | Robert Speicher | 2017-02-07 | 2 | -0/+66 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Address feedback | Douwe Maan | 2017-02-06 | 1 | -2/+0 |
| * | | | | Improve performance of finding last deployed environment | Douwe Maan | 2017-02-06 | 1 | -0/+14 |
| * | | | | Add tests | Douwe Maan | 2017-02-06 | 1 | -0/+2 |
| * | | | | Validate route map | Douwe Maan | 2017-02-06 | 1 | -0/+52 |
* | | | | | Merge branch 'jej-fix-backup-rake-color' into 'master' | Sean McGivern | 2017-02-07 | 1 | -6/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed backup.rake colorize method following Pages -> CEjej-fix-backup-rake-color | Connor Shea | 2017-02-07 | 1 | -6/+6 |
* | | | | | | Merge branch '21518_recaptcha_spam_issues' into 'master' | Sean McGivern | 2017-02-07 | 1 | -0/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use reCaptcha when an issue identified as spam | Jarka Kadlecova | 2017-02-07 | 1 | -0/+4 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'remove-deploy-key-endpoint' into 'master' | Rémy Coutable | 2017-02-07 | 3 | -89/+206 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove /projects/:id/keys/.. endpoints | Robert Schilling | 2017-02-07 | 3 | -89/+206 |
* | | | | | | | Merge branch '27785-fix-init-script-after-pages-to-ce' into 'master' | Douwe Maan | 2017-02-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Fix syntax error in init.d/gitlab after Pages -> CE | Drew Blessing | 2017-02-07 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'api-remove-snippets-expires-at' into 'master' | Sean McGivern | 2017-02-07 | 7 | -74/+223 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Split V3 entities into a separate fileapi-remove-snippets-expires-at | Robert Schilling | 2017-02-07 | 6 | -93/+95 |
| * | | | | | Remove deprecated 'expires_at' from project snippets API | Robert Schilling | 2017-02-07 | 3 | -3/+150 |
* | | | | | | Merge branch 'fix/import-group-members' into 'master' | Rémy Coutable | 2017-02-07 | 4 | -3/+34 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Add missing group members to export for I/Efix/import-group-members | James Lopez | 2017-02-07 | 4 | -3/+34 |
| | |_|_|/ | |/| | | | |||||
* | | | | | added missed commit in rebase | James Lopez | 2017-02-07 | 1 | -3/+1 |
* | | | | | update Grape routes to work with current version of Grape | James Lopez | 2017-02-07 | 1 | -1/+7 |
* | | | | | Merge branch 'ee-1439-read-only-user' into 'master' | Douwe Maan | 2017-02-07 | 1 | -1/+13 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | List all groups/projects for admins on explore pages | Douwe Maan | 2017-02-06 | 1 | -1/+13 |
| |/ / / | |||||
* | | | | Merge branch 'fix-references-header-parsing' into 'master' | Sean McGivern | 2017-02-06 | 2 | -6/+27 |
|\ \ \ \ | |||||
| * | | | | No strong reasons to freeze them | Lin Jen-Shin | 2017-02-07 | 1 | -3/+2 |
| * | | | | Freeze regexp and add a commentfix-references-header-parsing | Lin Jen-Shin | 2017-02-03 | 1 | -1/+3 |
| * | | | | Use references variable | Lin Jen-Shin | 2017-02-03 | 1 | -1/+3 |
| * | | | | Use message_id_regexp variable for the regexp | Lin Jen-Shin | 2017-02-03 | 1 | -1/+3 |
| * | | | | Merge remote-tracking branch 'upstream/master' into fix-references-header-par... | Lin Jen-Shin | 2017-02-03 | 103 | -473/+1174 |
| |\ \ \ \ | |||||
| * | | | | | Specify that iOS app would also do this | Lin Jen-Shin | 2017-01-20 | 1 | -1/+3 |
| * | | | | | Fix References header parser for Microsoft Exchange | Lin Jen-Shin | 2017-01-20 | 2 | -6/+20 |
* | | | | | | Merge branch 'fix/gb/backwards-compatibility-coverage-ci-yml' into 'master' | Douwe Maan | 2017-02-06 | 1 | -4/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove coverage entry from global CI/CD options | Grzegorz Bizon | 2017-02-04 | 1 | -4/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'jej-pages-to-ce' into 'master' | Douwe Maan | 2017-02-06 | 11 | -39/+269 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ce | James Edwards-Jones | 2017-02-06 | 15 | -50/+525 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge branch 'master' into jej-pages-picked-from-ee | James Edwards-Jones | 2017-02-03 | 44 | -222/+618 |
| |\ \ \ \ \ | |||||
| * | | | | | | Ported max_pages_size in settings API to CE | James Edwards-Jones | 2017-02-02 | 1 | -1/+2 |
| * | | | | | | Add missing gitlab-pages related vars in init.d/gitlab | Achilleas Pipinellis | 2017-01-31 | 1 | -2/+2 |