summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 8.17.8v8.17.88-17-stableJames Edwards-Jones2017-08-091-1/+1
* Update CHANGELOG.md for 8.17.8James Edwards-Jones2017-08-093-9/+5
* Merge branch '8-17-mark-thunky-as-MIT' into '8-17-stable'Mike Greiling2017-08-081-0/+7
|\
| * Mark thunky as MIT license for license_finderJames Edwards-Jones2017-08-081-0/+7
* | Merge branch 'import-symlinks-8-17' into 'security-8-17'Mike Greiling2017-08-083-1/+14
* | Merge branch 'rs-alphanumeric-ssh-params-8-17' into 'security-8-17'Mike Greiling2017-08-083-0/+47
* | Update VERSION to 8.17.7v8.17.7James Edwards-Jones2017-07-191-1/+1
* | Update CHANGELOG.md for 8.17.7James Edwards-Jones2017-07-193-8/+5
|/
* Merge branch '33303-8-17-security-fix' into 'security-8-17'Sean McGivern2017-07-193-0/+40
* Merge branch 'fix-changelog-entry' into 'security-9-2'Sean McGivern2017-07-191-0/+0
* Merge branch 'security-8-17-backport-33323-fix-incorrect-project-authorizatio...Sean McGivern2017-07-193-1/+35
* Update VERSION to 8.17.6v8.17.6Lin Jen-Shin2017-05-051-1/+1
* Update CHANGELOG.md for 8.17.6Lin Jen-Shin2017-05-059-32/+11
* Backport rake downtime_check otherwise it's not passingLin Jen-Shin2017-05-051-3/+4
* Don't need to check this old migrationLin Jen-Shin2017-05-051-0/+2
* Escape single quotes from gl dropdownFelipe Artur2017-05-041-0/+2
* Fix specsFelipe Artur2017-05-042-22/+2
* Merge branch 'fix-hamlit-xss' into 'security-9-1' Robert Speicher2017-05-045-3/+29
* Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan2017-05-0422-183/+387
* Merge branch 'branch-name-escape' into 'security' Robert Speicher2017-05-043-7/+19
* Merge branch '31157-respect-project-features-in-wiki-search' into 'security' Douwe Maan2017-05-043-3/+80
* Merge branch 'snippets_visibility' into 'security'Sean McGivern2017-05-044-201/+165
* Merge branch 'rs-sanitize-submodule-urls' into 'security' Douwe Maan2017-05-043-16/+46
* Merge branch 'bvl-markup-pipeline' into 'security' Robert Speicher2017-05-047-32/+60
* Merge branch 'bvl-validate-urls-in-markdown-using-uri' into 'security' Robert Speicher2017-05-043-55/+70
* Update VERSION to 8.17.5v8.17.5DJ Mountney2017-04-051-1/+1
* Update CHANGELOG.md for 8.17.5DJ Mountney2017-04-056-21/+8
* Merge branch 'open-redirect-host-fix' into 'security' Sean McGivern2017-04-057-3/+37
* Merge branch 'path-disclosure-proj-import-export' into 'security' DJ Mountney2017-04-053-1/+17
* 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 '29364-private-projects-mr-fix' into 'security' Sean McGivern2017-04-054-2/+60
* Merge branch '30125-markdown-security' into 'security'Robert Speicher2017-04-0510-32/+71
* Update VERSION to 8.17.4v8.17.4James Lopez2017-03-191-1/+1
* Update CHANGELOG.md for 8.17.4James Lopez2017-03-193-8/+5
* 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-1831-38/+39
* 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
* Merge branch 'cherry-pick-bba00a8a' into '8-17-stable' Robert Speicher2017-03-154-4/+6
|\
| * Merge branch 'update-new-ip-pages-docs' into 'master' cherry-pick-bba00a8aAchilleas Pipinellis2017-03-144-4/+6
* | Fix migrations not specifying DOWNTIMERémy Coutable2017-03-153-3/+17
* | Add `DOWNTIME = false` to 20160620115026_add_index_on_runners_locked.rbRémy Coutable2017-03-151-0/+2
* | Add `DOWNTIME = false` to db/migrate/20160615142710_add_index_on_requested_at...Rémy Coutable2017-03-151-0/+2
* | Merge branch 'docs/include-gitlab-defaul-example-in-updates-stable' into '8-1...Rémy Coutable2017-03-141-1/+15
|\ \ | |/ |/|
| * Include instructions to update /etc/default/gitlabdocs/include-gitlab-defaul-example-in-updates-stableAchilleas Pipinellis2017-03-141-1/+15
|/
* Update VERSION to 8.17.3v8.17.3Regis2017-03-071-1/+1
* Update CHANGELOG.md for 8.17.3Regis2017-03-077-24/+9
* Fix rubocop failureFelipe Artur2017-03-071-3/+3