summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 10.4.7v10.4.710-4-stableFilipa Lacerda2018-04-031-1/+1
* Update CHANGELOG.md for 10.4.7Filipa Lacerda2018-04-033-10/+8
* Merge branch 'security-original-branch-10-4' into '10-4-stable'James Lopez2018-04-0336-22/+505
|\
| * Fix schema.rb conflictJames Edwards-Jones2018-04-031-4/+0
| * Merge branch 'jej/mattermost-notification-confidentiality' into 'security-10-4'Douwe Maan2018-04-0336-22/+509
|/
* Merge branch '42028-xss-diffs-10-4' into 'security-10-4'Douwe Maan2018-04-033-4/+38
* Merge branch 'fl-fix-milestone-bug-10-4' into 'security-10-4'Phil Hughes2018-04-032-4/+21
* Update VERSION to 10.4.6v10.4.6Mark Fletcher2018-03-161-1/+1
* Update CHANGELOG.md for 10.4.6Mark Fletcher2018-03-163-10/+8
* Merge branch '10-4-stable-patch-6' into '10-4-stable'Mark Fletcher2018-03-1648-132/+545
|\
| * Merge branch 'fix/auth0-unsafe-login-10-4' into 'security-10-4'James Lopez2018-03-168-50/+134
| * Merge branch 'fj-15329-services-callbacks-ssrf-10-4' into 'security-10-4'Douwe Maan2018-03-1640-82/+411
|/
* Update VERSION to 10.4.5v10.4.5Robert Speicher2018-03-011-1/+1
* Update CHANGELOG.md for 10.4.5Robert Speicher2018-03-012-5/+7
* Merge branch '10-4-stable-patch-5' into '10-4-stable'Robert Speicher2018-03-014-1/+19
|\
| * Merge branch 'pages-6-1' into 'security-10-4'Marin Jankovski2018-02-271-1/+1
| * Merge branch 'sh-fix-otp-backup-invalidation-10-4' into 'security-10-4'Douwe Maan2018-02-273-0/+18
|/
* Update VERSION to 10.4.4v10.4.4Ian Baum2018-02-161-1/+1
* Update CHANGELOG.md for 10.4.4Ian Baum2018-02-1611-51/+19
* Merge branch '10-4-stable-patch-4' into '10-4-stable'Stan Hu2018-02-1549-318/+561
|\
| * Merge branch 'fj-fixed-bug-17054' into 'master'Douwe Maan2018-02-151-1/+1
| * Merge branch 'fj-37528-error-after-disabling-ldap' into 'master'Douwe Maan2018-02-157-2/+68
| * Merge branch 'update-prometheus-vendor-yml' into '10-4-stable-patch-4'Robert Speicher2018-02-151-77/+59
| |\
| | * Update Prometheus vendor YML for 2.1 supportupdate-prometheus-vendor-ymlJoshua Lambert2018-02-151-77/+59
| * | Merge branch 'mk-10-4-4-fix-no-untracked-upload-files-error' into '10-4-stabl...10-4-stable-patch-4Robert Speicher2018-02-155-46/+112
| |\ \
| | * | Fix dir exists spec errormk-10-4-4-fix-no-untracked-upload-files-errorMichael Kozono2018-02-141-1/+1
| | * | Add changelog entryMichael Kozono2018-02-141-0/+5
| | * | Schedule PopulateUntrackedUploads if neededMichael Kozono2018-02-142-1/+48
| | * | Fix orphan temp table untracked_files_for_uploadsMichael Kozono2018-02-142-54/+44
| | * | Fix last batch size equals max batch size errorMichael Kozono2018-02-142-1/+25
| | |/
| * | Resolve spec/migrations/remove_project_labels_group_id_spec.rb failureRobert Speicher2018-02-151-1/+1
| |/
| * Merge branch 'dm-git-hook-popen' into 'master'Stan Hu2018-02-141-8/+14
| * Merge branch 'dm-sidekiq-memory-killer-getcwd' into 'master'Stan Hu2018-02-141-1/+1
| * Merge branch 'fix-migration-timestamp' into 'master'Stan Hu2018-02-141-0/+21
| * Merge branch 'dm-user-namespace-route-path-validation' into 'master'Sean McGivern2018-02-146-16/+36
| * Merge branch 'bvl-fix-500-on-fork-without-restricted-visibility-levels' into ...Douwe Maan2018-02-143-1/+15
| * Merge branch '42696-gitlab-import-leaves-group_id-on-projectlabel' into 'master'Stan Hu2018-02-146-4/+50
| * Merge branch 'winh-new-branch-dropdown-style' into 'master'Phil Hughes2018-02-1410-139/+135
| * Merge branch '42160-error-500-loading-merge-request-undefined-method-index-fo...Douwe Maan2018-02-143-0/+17
| * Merge branch 'sh-fix-jira-trailing-slash' into 'master'Robert Speicher2018-02-143-1/+29
| * Merge branch 'remove_ldap_person_validation' into 'master'Stan Hu2018-02-143-24/+5
|/
* Merge branch '42591-update-nokogiri' into 'master'Stan Hu2018-02-073-3/+8
* Update VERSION to 10.4.3v10.4.3Luke Bennett2018-02-051-1/+1
* Update CHANGELOG.md for 10.4.3Luke Bennett2018-02-055-20/+10
* Revert change to schema versionRobert Speicher2018-02-021-1/+1
* Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4'Kamil Trzciński2018-02-025-9/+25
* Merge branch 'fix-mermaid-xss' into 'security-10-4'Douwe Maan2018-01-3110-16/+131
* Merge branch 'fix/gh-namespace-issue' into 'security-10-4'James Lopez2018-01-317-30/+88
* Merge branch 'security-10-4-todo-api-reveals-sensitive-information' into 'sec...Robert Speicher2018-01-315-2/+19
* Merge branch 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibil...Douwe Maan2018-01-319-75/+410
View Lorry Controller Status