summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rename_delete_services' into 'master'Rémy Coutable2017-02-083-3/+3
|\
| * Fix inconsistent naming for services that delete thingsdixpac2017-02-083-3/+3
* | Merge branch '23104-remove-public-param-for-projects' into 'master' Douwe Maan2017-02-081-15/+4
|\ \
| * | API: remove `public` param for projectsToon Claes2017-02-071-15/+4
* | | Merge branch 'feature/gb/paginated-environments-api' into 'master'Rémy Coutable2017-02-082-1/+37
|\ \ \
| * \ \ Merge branch 'master' into feature/gb/paginated-environments-apiFilipa Lacerda2017-02-0727-219/+1431
| |\ \ \ | | | |/ | | |/|
| * | | Add specs for standalone pagination for serializersGrzegorz Bizon2017-02-061-0/+9
| * | | Move serializers pagination class to separate moduleGrzegorz Bizon2017-02-061-0/+27
| * | | Rename `Gitlab::Serialize` module to reuse it laterGrzegorz Bizon2017-02-061-1/+1
* | | | Merge branch 'jej-lint-scripts-and-config' into 'master'dz-nested-groups-docsDouwe Maan2017-02-081-0/+25
|\ \ \ \
| * | | | CI runs lint on shell scripts in lib/supportjej-lint-scripts-and-configJames Edwards-Jones2017-02-071-0/+25
* | | | | Use stricter regex anchorsroute-map-string-sourceDouwe Maan2017-02-071-1/+1
* | | | | Support a string source in the route mapDouwe Maan2017-02-071-17/+15
* | | | | Merge branch 'route-map' into 'master' Robert Speicher2017-02-072-0/+66
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Address feedbackDouwe Maan2017-02-061-2/+0
| * | | | Improve performance of finding last deployed environmentDouwe Maan2017-02-061-0/+14
| * | | | Add testsDouwe Maan2017-02-061-0/+2
| * | | | Validate route mapDouwe Maan2017-02-061-0/+52
* | | | | Merge branch 'jej-fix-backup-rake-color' into 'master'Sean McGivern2017-02-071-6/+6
|\ \ \ \ \
| * | | | | Fixed backup.rake colorize method following Pages -> CEjej-fix-backup-rake-colorConnor Shea2017-02-071-6/+6
* | | | | | Merge branch '21518_recaptcha_spam_issues' into 'master'Sean McGivern2017-02-071-0/+4
|\ \ \ \ \ \
| * | | | | | Use reCaptcha when an issue identified as spamJarka Kadlecova2017-02-071-0/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'remove-deploy-key-endpoint' into 'master' Rémy Coutable2017-02-073-89/+206
|\ \ \ \ \ \
| * | | | | | Remove /projects/:id/keys/.. endpointsRobert Schilling2017-02-073-89/+206
* | | | | | | Merge branch '27785-fix-init-script-after-pages-to-ce' into 'master' Douwe Maan2017-02-071-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix syntax error in init.d/gitlab after Pages -> CEDrew Blessing2017-02-071-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'api-remove-snippets-expires-at' into 'master'Sean McGivern2017-02-077-74/+223
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Split V3 entities into a separate fileapi-remove-snippets-expires-atRobert Schilling2017-02-076-93/+95
| * | | | | Remove deprecated 'expires_at' from project snippets APIRobert Schilling2017-02-073-3/+150
* | | | | | Merge branch 'fix/import-group-members' into 'master' Rémy Coutable2017-02-074-3/+34
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add missing group members to export for I/Efix/import-group-membersJames Lopez2017-02-074-3/+34
| | |_|_|/ | |/| | |
* | | | | added missed commit in rebaseJames Lopez2017-02-071-3/+1
* | | | | update Grape routes to work with current version of GrapeJames Lopez2017-02-071-1/+7
* | | | | Merge branch 'ee-1439-read-only-user' into 'master' Douwe Maan2017-02-071-1/+13
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | List all groups/projects for admins on explore pagesDouwe Maan2017-02-061-1/+13
| |/ / /
* | | | Merge branch 'fix-references-header-parsing' into 'master' Sean McGivern2017-02-062-6/+27
|\ \ \ \
| * | | | No strong reasons to freeze themLin Jen-Shin2017-02-071-3/+2
| * | | | Freeze regexp and add a commentfix-references-header-parsingLin Jen-Shin2017-02-031-1/+3
| * | | | Use references variableLin Jen-Shin2017-02-031-1/+3
| * | | | Use message_id_regexp variable for the regexpLin Jen-Shin2017-02-031-1/+3
| * | | | Merge remote-tracking branch 'upstream/master' into fix-references-header-par...Lin Jen-Shin2017-02-03103-473/+1174
| |\ \ \ \
| * | | | | Specify that iOS app would also do thisLin Jen-Shin2017-01-201-1/+3
| * | | | | Fix References header parser for Microsoft ExchangeLin Jen-Shin2017-01-202-6/+20
* | | | | | Merge branch 'fix/gb/backwards-compatibility-coverage-ci-yml' into 'master' Douwe Maan2017-02-061-4/+1
|\ \ \ \ \ \
| * | | | | | Remove coverage entry from global CI/CD optionsGrzegorz Bizon2017-02-041-4/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jej-pages-to-ce' into 'master' Douwe Maan2017-02-0611-39/+269
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-0615-50/+525
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-0344-222/+618
| |\ \ \ \ \
| * | | | | | Ported max_pages_size in settings API to CEJames Edwards-Jones2017-02-021-1/+2
| * | | | | | Add missing gitlab-pages related vars in init.d/gitlabAchilleas Pipinellis2017-01-311-2/+2