summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge branch 'docs/pages-backport' into '8-17-stable' Felipe Artur2017-03-0624-437/+1333
|\
| * Move all Pages related content to a single locationdocs/pages-backportAchilleas Pipinellis2017-03-0324-437/+1333
* | Rename DestroyService to DeleteService on BlobsController#destroyFelipe Artur2017-03-061-1/+1
* | Merge branch 'dm-fix-api-create-file-on-empty-repo' into 'master'Robert Speicher2017-03-066-40/+37
* | Revert "Merge branch 'dm-fix-api-create-file-on-empty-repo' into 'master'"Felipe Artur2017-03-068-341/+42
* | Revert "Merge branch '28010-mr-merge-button-default-to-danger' into 'master'"Felipe Artur2017-03-069-125/+38
* | Merge branch 'add-additional-checks-to-ca-data' into 'master'Jacob Schatz2017-03-0613-25/+161
* | Merge branch '23602-show-milestone-id-in-a-consistent-way' into 'master' Alfredo Sumaran2017-03-034-6/+5
* | Merge branch '28010-mr-merge-button-default-to-danger' into 'master'Alfredo Sumaran2017-03-039-38/+125
* | Merge branch '28609-fix-redirect-to-home-page-url' into 'master'Robert Speicher2017-03-034-36/+62
* | Merge branch 'dm-dont-copy-toolip' into 'master' Jacob Schatz2017-03-032-0/+7
* | Merge branch '27622-cycle-analytics-loading' into 'master'Alfredo Sumaran2017-03-031-3/+8
|/
* Merge branch '28808-fix-top-level-constant-referenced' into 'master' Rémy Coutable2017-03-031-1/+7
* Merge branch '28850-fix-broken-migration' into 'master' Sean McGivern2017-03-032-4/+6
* Merge branch 'js_should_user_right_api_version' into 'master'Sean McGivern2017-03-031-2/+2
* Merge branch 'use-v3-api-on-frontend' into 'master' Sean McGivern2017-03-031-0/+4
* Merge branch 'dm-fix-api-create-file-on-empty-repo' into 'master'Robert Speicher2017-03-038-42/+341
* Merge branch 'dm-fix-cherry-pick' into 'master'Robert Speicher2017-03-0313-130/+316
* Merge branch '28933-update-rubyzip' into 'master'Sean McGivern2017-03-031-2/+2
* Merge branch 'revert_disallow_system_notes_for_closed_issuables' into 'master' Sean McGivern2017-03-032-40/+0
* Merge branch '8-17-stable-yarn-lock' into '8-17-stable' Stan Hu2017-03-0310-90/+43
|\
| * Include yarn as an optional dependency only8-17-stable-yarn-lockMike Greiling2017-03-031-0/+4310
| * Revert "Merge branch '8-17-stable-pick-yarn-support' into '8-17-stable'"Mike Greiling2017-03-0311-4400/+43
|/
* Merge branch '8-17-stable-pick-yarn-support' into '8-17-stable' Douwe Maan2017-03-0111-43/+4400
|\
| * Pick !9590 into 8-17-stable8-17-stable-pick-yarn-supportMike Greiling2017-02-281-4/+3
| * Pick !9316 into 8-17-stableMike Greiling2017-02-287-29/+75
| * Pick !9055 into 8-17-stableMike Greiling2017-02-286-15/+4327
* | Update VERSION to 8.17.2v8.17.2James Lopez2017-03-011-1/+1
* | Update CHANGELOG.md for 8.17.2James Lopez2017-03-012-4/+4
* | Merge branch 'fix-builds-processing' into 'master' DJ Mountney2017-03-012-12/+69
* | Merge branch '8-17-stable-force-expire-cache' into '8-17-stable' DJ Mountney2017-03-012-1/+5
|\ \ | |/ |/|
| * Add Changelog entry for our expired cache change so the changelog won't read ...8-17-stable-force-expire-cacheDJ Mountney2017-03-011-0/+4
| * expire all webpack assets by altering filename postfixMike Greiling2017-02-281-1/+1
|/