summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '6417-extract-ee-specific-files-lines-for-lib-gitlab-email-handl...Douwe Maan2018-09-037-11/+26
|\
| * Remove requires from email handlersSean McGivern2018-09-031-5/+0
| * Add frozen_string_literal: true to email handlersSean McGivern2018-09-037-0/+14
| * Extract EE-specific lines from Gitlab::Email::HandlerSean McGivern2018-09-031-7/+13
* | Merge branch 'sh-improve-bitbucket-server-logging' into 'master'Rémy Coutable2018-09-032-3/+69
|\ \
| * | Add JSON logging for Bitbucket Server importerStan Hu2018-08-302-3/+69
* | | Merge branch '50564-chat-service-refactoring' into 'master'Nick Thomas2018-09-031-2/+6
|\ \ \
| * | | Use sample data for push event when no commits createdTakuya Noguchi2018-08-311-2/+6
* | | | Merge branch 'issue_48084' into 'master'Sean McGivern2018-09-031-9/+3
|\ \ \ \
| * | | | Use a serializer to render diff linesFelipe Artur2018-08-311-9/+3
* | | | | Merge branch 'feature/#32877-add-default-field-branch-api' into 'master'Robert Speicher2018-09-011-0/+4
|\ \ \ \ \
| * | | | | Add default parameter to branches APIRiccardo Padovani2018-08-181-0/+4
* | | | | | Merge branch 'ash.mckenzie/allow-auth-via-jwt' into 'master'Robert Speicher2018-08-311-0/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Allow auth via JWT (always false in CE)ash.mckenzie/allow-auth-via-jwtAsh McKenzie2018-08-141-0/+6
* | | | | | Merge branch '47765-group-visibility-error-due-to-string-conversion' into 'ma...Douwe Maan2018-08-311-1/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Changes update_column to update_attributes in ProjectTreeRestorer#restore_pro...Tiago Botelho2018-08-281-1/+4
| | |/ / / | |/| | |
* | | | | Merge branch '50414-rubocop-rule-to-enforce-class-methods-over-module' into '...Sean McGivern2018-08-305-5/+5
|\ \ \ \ \
| * | | | | Updates code using class_methods over module ClassMethodsJacopo2018-08-295-5/+5
| | |_|/ / | |/| | |
* | | | | Fix Error 500s due to encoding issues when Wiki hooks fireStan Hu2018-08-291-1/+1
|/ / / /
* | | | Merge branch 'rails5-silence-stream' into 'master'Sean McGivern2018-08-291-1/+12
|\ \ \ \
| * | | | Rails 5: replace removed silence_streamJasper Maes2018-08-281-1/+12
* | | | | Include rich_text in diff cache keysSean McGivern2018-08-281-3/+4
* | | | | Escaped html charactersChantal Rollison2018-08-282-2/+2
* | | | | Resolve "Orphaned upload files are accessible via project exports"Michael Kozono2018-08-281-8/+11
* | | | | Block link-local addresses in URLBlockerStan Hu2018-08-281-0/+8
* | | | | Removes <br> sent from backend on tooltips in jobsFilipa Lacerda2018-08-281-1/+1
* | | | | Merge branch 'fldubois/gitlab-ce-fix-api-group-createdat' into 'master'Rémy Coutable2018-08-282-11/+5
|\ \ \ \ \
| * | | | | Use policies to determine if attributes can be set in the APISean McGivern2018-08-222-9/+3
| * | | | | Allow date parameters on Issues and Notes API for group ownersFlorent Dubois2018-08-222-4/+4
* | | | | | Merge branch 'issue_36138' into 'master'Sean McGivern2018-08-282-3/+14
|\ \ \ \ \ \
| * | | | | | Allow to delete group milestonesissue_36138Felipe Artur2018-08-062-3/+14
* | | | | | | Merge branch 'bvl-add-galician' into 'master'Grzegorz Bizon2018-08-271-0/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add Galician as an available languagebvl-add-galicianBob Van Landuyt2018-08-141-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'sh-insert-git-data-in-separate-transaction' into 'master'Yorick Peterse2018-08-262-8/+50
|\ \ \ \ \ \
| * | | | | | Bitbucket Server importer: Eliminate most idle-in-transaction issuesStan Hu2018-08-262-8/+50
* | | | | | | API: Protected tagsRobert Schilling2018-08-253-4/+89
* | | | | | | Merge branch '50345-hashed-storage-feature-flag' into 'master'Nick Thomas2018-08-251-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fixed `stub_feature_flag behavior` for `disabled?` flags.Gabriel Mazetto2018-08-221-1/+2
* | | | | | | Merge branch 'sh-simplify-github-importer-refactor' into 'master'Yorick Peterse2018-08-245-91/+118
|\ \ \ \ \ \ \
| * | | | | | | Refactor GitHub Importer database helpers into helper methodsStan Hu2018-08-245-91/+118
* | | | | | | | Allows author to vote on their own issueChantal Rollison2018-08-241-1/+1
|/ / / / / / /
* | | | | | | Merge branch '6965-backport-to-ce' into 'master'Stan Hu2018-08-231-10/+14
|\ \ \ \ \ \ \
| * | | | | | | Backport LDAP changes to CEDouglas Barbosa Alexandre2018-08-231-10/+14
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '43096-controller-projects-issuescontroller-referenced_merge_req...Nick Thomas2018-08-231-2/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix routes N+1 in Issues::ReferencedMergeRequestsService#executeSean McGivern2018-08-211-2/+3
* | | | | | | Merge branch 'ccr/48800/ping_for_boards' into 'master'Sean McGivern2018-08-231-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Added count for label, assignee, and milestone listsccr/48800/ping_for_boardsChantal Rollison2018-08-211-0/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jprovazn-fix-form-uploads' into 'master'Kamil Trzciński2018-08-231-3/+7
|\ \ \ \ \ \ \
| * | | | | | | Add public/uploads/tmp to allowed upload pathsjprovazn-fix-form-uploadsJan Provaznik2018-08-211-3/+7
| |/ / / / / /
* | | | | | | Fix broken Git over HTTP clones with LDAP usersStan Hu2018-08-221-0/+1
| |_|_|_|/ / |/| | | | |
View Lorry Controller Status