summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | Simplify NGINX server_name regexAchilleas Pipinellis2017-01-312-3/+3
| * | | | | | chmod 644 gitlab.default.exampleAchilleas Pipinellis2017-01-311-0/+0
| * | | | | | Set pages daemon to falseAchilleas Pipinellis2017-01-311-5/+5
| * | | | | | Add missing variables for gitlab-pagesAchilleas Pipinellis2017-01-311-0/+5
| * | | | | | Change the pages daemon proxy listen port to 8090Achilleas Pipinellis2017-01-313-3/+3
| * | | | | | Change NGINX pages configs to account for the Pages daemonAchilleas Pipinellis2017-01-312-19/+15
| * | | | | | Add init scripts for GitLab Pages daemonAchilleas Pipinellis2017-01-312-7/+78
| * | | | | | Fix confusing implementation detail in nginx config about how gitlab-pages wo...Kamil Trzcinski2017-01-312-6/+4
| * | | | | | Bring back GitLab Pages SSL configKamil Trzcinski2017-01-312-0/+84
| * | | | | | Rename pages namespace or project path when changedKamil Trzcinski2017-01-313-29/+43
| * | | | | | Revert "Store pages in shared/pages/fqdn/fqdn/public or shared/pages/fqdn/sub...Kamil Trzcinski2017-01-312-87/+4
| * | | | | | Store pages in shared/pages/fqdn/fqdn/public or shared/pages/fqdn/subpath/pub...Kamil Trzcinski2017-01-312-4/+87
| * | | | | | Fix specsKamil Trzcinski2017-01-311-1/+1