summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-02-096-19/+37
|\
| * Merge branch 'master' into ci-permissionsKamil Trzcinski2016-02-053-9/+35
| |\
| * \ Merge remote-tracking branch 'origin/master' into ci-permissionsKamil Trzcinski2016-02-0412-25/+124
| |\ \
| * | | Rename allow_guest_to_access_builds to public_buildsKamil Trzcinski2016-02-042-8/+8
| * | | Expose allow_guest_to_access_builds in GitLab APIKamil Trzcinski2016-02-042-3/+10
| * | | Make the CI permission model simplerKamil Trzcinski2016-02-024-15/+26
* | | | Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master' Douwe Maan2016-02-091-0/+1
|\ \ \ \
| * | | | Expose MergeRequest::merge_status to APIAndrei Dziahel2016-02-081-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'rs-broadcast-markdown' into 'master' Douwe Maan2016-02-091-0/+16
|\ \ \ \
| * | | | Allow limited Markdown in Broadcast Messagesrs-broadcast-markdownRobert Speicher2016-02-061-0/+16
| |/ / /
* | | | Merge branch 'increase_import_timeout' into 'master' Douwe Maan2016-02-091-1/+1
|\ \ \ \
| * | | | Increase project import timeout from 4 minutes to 15 minutesDrew Blessing2016-02-041-1/+1
| |/ / /
* | | | Merge branch 'snippet_search_refactoring'Valery Sizov2016-02-091-7/+3
|\ \ \ \
| * | | | one more improvement to snippet searchValery Sizov2016-02-051-1/+1
| * | | | Faster snippet searchValery Sizov2016-02-051-6/+2
| |/ / /
* | | | Merge branch 'backup-database-timeout-fix' into 'master' Robert Speicher2016-02-081-0/+3
|\ \ \ \
| * | | | Make sure there is a connection before using ActiveRecordbackup-database-timeout-fixJeroen Nijhof2016-02-081-0/+3
| |/ / /
* | | | Merge branch 'huacnlee/current-settings-autoload-bug-in-development' into 'ma...Robert Speicher2016-02-081-2/+2
|\ \ \ \
| * | | | Fix CurrentSettings autoload bug in development.huacnlee/current-settings-autoload-bug-in-developmentJason Lee2016-02-081-2/+2
| |/ / /
* | | | Merge branch 'fix-init' into 'master' Rémy Coutable2016-02-081-1/+1
|\ \ \ \
| * | | | Fixed init.d script not working on OS Xritave2016-02-081-1/+1
| |/ / /
* | | | suppress only errors in init-script while determining canonical path of gitla...Harald Spaethe2016-02-081-1/+1
|/ / /
* | | Merge branch 'fix/atom-url-issue' into 'master' Douwe Maan2016-02-042-3/+3
|\ \ \
| * | | fixed move project method in migrationJames Lopez2016-02-021-1/+1
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issueJames Lopez2016-02-021-4/+4
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issueJames Lopez2016-02-016-177/+54
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | refactor previous test and add validation to project modelJames Lopez2016-01-291-2/+2
* | | | | Merge remote-tracking branch 'origin/rs-database-info'Dmitriy Zaporozhets2016-02-041-6/+32
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Display database type and version in Administration dashboardrs-database-infoRobert Speicher2016-02-021-6/+32
* | | | | Make Pipelines responsible for defining their custom whitelistrs-whitelist-in-pipelineRobert Speicher2016-02-032-9/+13
* | | | | Merge branch 'support-akismet' into 'master' Robert Speicher2016-02-033-2/+63
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Memoize Akismet client initialization on AkismetHelperDouglas Barbosa Alexandre2016-02-021-2/+2
| * | | | Refactor spam filtering on issues APIDouglas Barbosa Alexandre2016-02-021-7/+8
| * | | | Support Akismet spam checking for creation of issues via APIStan Hu2016-02-023-2/+62
| | |_|/ | |/| |
* | | | Merge branch 'patch-1' into 'master' Robert Speicher2016-02-021-1/+1
|\ \ \ \
| * | | | Consistent rails_socket use.fbretel2016-01-251-1/+1
* | | | | Merge branch 'git-raw-workhorse' into 'master' Jacob Vosmaer2016-02-022-2/+23
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into git-raw-workhorseJacob Vosmaer2016-02-021-4/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Gotta have newlinesJacob Vosmaer2016-02-011-1/+1
| * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-raw...Jacob Vosmaer2016-02-0136-455/+898
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Use only one header to send git blobsJacob Vosmaer2016-02-012-4/+23
| * | | | | Send more raw blob data with workhorseJacob Vosmaer2016-01-281-2/+4
* | | | | | Merge branch 'Michi302/gitlab-ce-fix/pagination-links' into 'master' Dmitriy Zaporozhets2016-02-021-5/+15
|\ \ \ \ \ \
| * | | | | | Fix add_pagination_headers to keep request parameters in Link headerMichi3022016-02-021-5/+15
| | |_|/ / / | |/| | | |
* | | | | | Merge remote-tracking branch 'origin/master' into lazy-blobslazy-blobsJacob Vosmaer2016-02-021-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Allow "@" in file names and pathallow-@Jacob Vosmaer2016-02-011-4/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobsJacob Vosmaer2016-02-0130-426/+847
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'rename-inline-diff' into 'master' Robert Speicher2016-01-313-36/+52
| |\ \ \ \
| | * | | | Mark inline difference between old and new paths when a file is renamedDouwe Maan2016-01-293-36/+52
| * | | | | First pass at deleting projects in the background.Josh Frye2016-01-291-2/+2
| |/ / / /
View Lorry Controller Status