summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ssrf' into 'security' Rubén Dávila2017-03-181-0/+2
* Merge branch 'fix-links-target-blank' into 'security'Jacob Schatz2017-03-182-2/+3
* Merge branch 'ssrf' into 'security' Douwe Maan2017-03-181-0/+57
* Merge branch 'add-additional-checks-to-ca-data' into 'master'Jacob Schatz2017-03-067-0/+28
* Merge branch 'js_should_user_right_api_version' into 'master'Sean McGivern2017-03-031-2/+2
* Merge branch 'dm-fix-cherry-pick' into 'master'Robert Speicher2017-03-032-1/+197
* Revert "Merge branch '8-17-stable-pick-yarn-support' into '8-17-stable'"Mike Greiling2017-03-035-63/+25
* Pick !9316 into 8-17-stableMike Greiling2017-02-285-24/+62
* Pick !9055 into 8-17-stableMike Greiling2017-02-282-2/+2
* Fix a bad merge conflictRuben Davila2017-02-281-1/+1
* Merge branch 'zj-fix-slash-command-labels' into 'master' Douwe Maan2017-02-271-1/+1
* Merge branch '28093-snippet-and-issue-spam-check-on-edit' into 'master'Sean McGivern2017-02-276-8/+35
* Merge branch 'hash-concurrent-foreign-key-names' into 'master'Rémy Coutable2017-02-271-0/+57
* Merge branch '26881-backup-fails-if-data-changes' into 'master' Douwe Maan2017-02-211-1/+16
* Merge branch 'fix/import-hooks' into 'master' Rémy Coutable2017-02-173-32/+5
* Merge branch 'zj-fix-url-new-issue-presenter' into 'master' Kamil Trzciński2017-02-171-2/+2
* Merge branch 'snippets-search-performance' into 'master' Yorick Peterse2017-02-171-2/+2
* Merge branch '27873-when-a-commit-appears-in-several-projects-commit-comments...Rémy Coutable2017-02-171-1/+1
* Merge branch 'fix-8.17-upgrade-process' into 'master' Alfredo Sumaran2017-02-171-0/+1
* Merge 'dev/8-17-stable' into 8-17-stableRuben Davila2017-02-143-3/+13
|\
| * Merge branch 'fix-github-import-MR-wrong-project' into 'security' Robert Speicher2017-02-131-3/+7
| * Merge branch 'fix-rdoc-xss' into 'security' Robert Speicher2017-02-131-0/+3
| * Merge branch 'asciidoctor-xss-patch' into 'security' Robert Speicher2017-02-131-0/+3
* | Merge branch 'fix-ar-connection-leaks' into 'master'Rémy Coutable2017-02-141-1/+1
|/
* 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