summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 8.16.9v8.16.98-16-stableDJ Mountney2017-04-051-1/+1
* Update CHANGELOG.md for 8.16.9DJ Mountney2017-04-056-21/+8
* Merge branch 'open-redirect-host-fix' into 'security' Sean McGivern2017-04-057-3/+37
* Fix failures relating to bad conflict resolution from a cherry-picked changeDJ Mountney2017-04-051-2/+3
* Fix bug with conflict resolution for security release for the events_helper specDJ Mountney2017-04-051-6/+0
* Merge branch 'open-redirect-fix-continue-to' into 'security'Sean McGivern2017-04-053-1/+13
* Merge branch 'path-disclosure-proj-import-export' into 'security' DJ Mountney2017-04-053-1/+17
* Merge branch '29364-private-projects-mr-fix' into 'security'Sean McGivern2017-04-054-2/+64
* Merge branch '30125-markdown-security' into 'security'Robert Speicher2017-04-0510-32/+71
* Update VERSION to 8.16.8v8.16.8James Lopez2017-03-191-1/+1
* Update CHANGELOG.md for 8.16.8James Lopez2017-03-193-8/+5
* Fix broken specsRuben Davila2017-03-185-20/+21
* Merge branch 'ssrf' into 'security' Rubén Dávila2017-03-181-0/+2
* Merge branch 'render-json-leak' into 'security'DJ Mountney2017-03-184-2/+43
* Merge branch 'fix-links-target-blank' into 'security'Jacob Schatz2017-03-1830-52/+61
* Merge branch 'ssrf' into 'security' Douwe Maan2017-03-188-1/+140
* Merge branch '28058-hide-emails-in-atom-feeds' into 'security' Rémy Coutable2017-03-187-15/+25
* Update CHANGELOG.md for 8.16.7v8.16.7James Lopez2017-02-271-0/+1
* Update CHANGELOG.md for 8.16.7James Lopez2017-02-271-0/+1
* Update VERSION to 8.16.7James Lopez2017-02-271-1/+1
* Update CHANGELOG.md for 8.16.7James Lopez2017-02-272-4/+4
* Merge branch 'fix-compare-service-signature' into '8-16-stable' James Lopez2017-02-271-3/+2
|\
| * Fix CompareService signaturefix-compare-service-signatureSean McGivern2017-02-241-3/+2
* | fix migrationJames Lopez2017-02-241-0/+3
|/
* Revert "Merge branch '28357-colon-search' into 'master' "James Lopez2017-02-244-32/+2
* Merge branch 'fix-mr-size-with-over-100-files' into 'master' Sean McGivern2017-02-243-1/+53
* Merge branch '28357-colon-search' into 'master' Clement Ho2017-02-244-2/+32
* Merge branch 'patch-12' into 'master' James Lopez2017-02-242-2/+2
* Update VERSION to 8.16.6v8.16.6DJ Mountney2017-02-171-1/+1
* Update CHANGELOG.md for 8.16.6DJ Mountney2017-02-1714-53/+16
* Merge branch '28124-mrs-don-t-show-all-merge-errors' into 'master'Rémy Coutable2017-02-175-17/+102
* Merge branch 'fix-smart-interval-not-larger-than' into '8-16-stable' James Lopez2017-02-161-1/+1
|\
| * Change toBe to toBeLessThan to account for flakey timers, spec needs refactor...fix-smart-interval-not-larger-thanLuke "Jared" Bennett2017-02-161-1/+1
|/
* Fix spec failures in spec/javascripts/search_autocomplete_spec.jsRémy Coutable2017-02-151-3/+0
* Merge branch 'dont-delete-assigned-issuables' into 'master' Douwe Maan2017-02-153-4/+9
* Merge branch '24462-reduce_ldap_queries_for_lfs' into 'master' Robert Speicher2017-02-153-29/+82
* Merge branch '27343-autocomplete-post-to-wrong-url-when-not-hosting-in-root' ...Filipa Lacerda2017-02-155-11/+63
* Merge branch '27516-fix-wrong-call-to-project_cache_worker-method' into 'mast...Robert Speicher2017-02-152-1/+5
* Merge branch 'snippet-spam-fix' into 'master' Rémy Coutable2017-02-152-23/+25
* Merge branch 'snippet-spam' into 'master' Rémy Coutable2017-02-151-0/+4
* Merge branch 'api-fix-files' into 'master' Rémy Coutable2017-02-154-1/+11
* Merge branch '27267-unnecessary-queries-from-projects-dashboard-atom-and-json...Sean McGivern2017-02-152-3/+5
* Merge branch 'fix-anchor-scrolling' into 'master' Clement Ho2017-02-153-0/+20
* Merge branch 'sh-add-index-for-label-count' into 'master' Yorick Peterse2017-02-152-1/+13
* Merge branch 'remove-sidekiq-backup-ar-threads' into 'master' Douwe Maan2017-02-152-3/+5
* Merge branch '27756-fix-json-404-response' into 'master' Clement Ho2017-02-154-5/+28
* Merge branch 'fix-droplab-rendering' into 'master' Alfredo Sumaran2017-02-151-2/+2
* Merge branch '27480_deploy_keys_should_not_show_up_in_users_keys_list' into '...Douwe Maan2017-02-155-13/+53
* Merge branch 'refresh-permissions-when-moving-projects' into 'master' Rémy Coutable2017-02-157-3/+75
* Merge remote-tracking branch 'origin/8-16-stable' into 8-16-stableRobert Speicher2017-02-142-5/+8
|\