summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'add-additional-checks-to-ca-data' into 'master' "Alfredo Sumaran2017-02-107-28/+0
* Merge branch 'add-additional-checks-to-ca-data' into 'master' Alfredo Sumaran2017-02-107-0/+28
|\
| * Restore exposure of legend property for eventsAlfredo Sumaran2017-02-107-0/+28
* | Merge branch 'zj-rename-issuable-issue-base' into 'master'Rémy Coutable2017-02-104-4/+4
|\ \ | |/ |/|
| * Rename issuable to IssueBasezj-rename-issuable-issue-baseZ.J. van de Weg2017-02-084-4/+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-079-43/+88
| |\
| * | 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
* | | 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 '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 '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
| | |_|/ | |/| |
* | | | 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-0372-378/+948
| |\ \ \
| * | | | 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 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-063-3/+28
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Introduce maximum session time for terminal websocket connectionterminal-max-session-timeAdam Niedzielski2017-02-062-3/+4
| |/ / /
| * | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-034-6/+5
| |\ \ \
| * \ \ \ Merge branch 'master' into webpackMike Greiling2017-02-0224-200/+537
| |\ \ \ \
| * | | | | add rack middleware to proxy webpack dev serverMike Greiling2017-02-011-0/+24
* | | | | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-0327-206/+540
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'fwn-to-find-by-full-path' into 'master' Dmitriy Zaporozhets2017-02-032-3/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | replace `find_with_namespace` with `find_by_full_path`Adam Pahlevi2017-02-032-3/+3
| * | | | | Merge branch 'fix-git-hooks-when-creating-file' into 'master' Douwe Maan2017-02-021-1/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-0240-213/+493
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-2696-378/+3987
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-0468-602/+1434
| | |\ \ \ \ \ \ \
| | * | | | | | | | Unify parameters and callback after hooksLin Jen-Shin2016-12-141-1/+1
| * | | | | | | | | Merge branch '20452-remove-require-from-request_profiler-initializer' into 'm...27537-flash-of-human-un-friendly-utc-timestampRobert Speicher2017-02-021-2/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Don't require lib/gitlab/request_profiler/middleware.rb in config/initializer...20452-remove-require-from-request_profiler-initializerRémy Coutable2017-02-021-2/+1
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch '20248-add-coverage-regex-in-job-yaml' into 'master'Douwe Maan2017-02-026-15/+85
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Make some other refinements to validation logicLeandro Camargo2017-01-251-2/+2
View Lorry Controller Status