summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 9.0.9v9.0.9Regis2017-06-021-1/+1
|
* Update CHANGELOG.md for 9.0.9Regis2017-06-022-4/+4
| | | [ci skip]
* fix double method definition for can_read-referenceRegis2017-06-021-4/+0
|
* Merge branch '25934-project-snippet-vis' into 'security-9-2'Douwe Maan2017-06-0214-18/+210
| | | | | | Fix visibility when referencing snippets See merge request !2101
* Merge branch 'fix-security-9-0-conflicts-for-mr-2112' into 'security-9-0'Regis Boudinot2017-06-024-2/+17
| | | | | Fix conflicts while picking !2112 to `security-9-0` See merge request !2113
* Update VERSION to 9.0.8v9.0.8Regis2017-05-311-1/+1
|
* Update CHANGELOG.md for 9.0.8Regis2017-05-314-12/+6
| | | [ci skip]
* Only check new migrations in 'rake down_timecheck'Douwe Maan2017-05-311-1/+1
| | | | This is necessary for the `security-9-0` build to pass.
* Merge branch 'dz-restrict-autocomplete' into 'security-9-1' Robert Speicher2017-05-313-11/+25
| | | | | Allow users autocomplete by author_id only for authenticated users See merge request !2100
* Merge branch '28917-contain-uploads-in-system-dir' into 'security'Douwe Maan2017-05-3135-30/+959
| | | | | | Upload files into `public/upload/system` instead of `public/upload` See merge request !2073
* Merge branch 'dz-api-x-frame' into 'security-9-2'Robert Speicher2017-05-312-0/+5
| | | | | | Restrict API X-Frame-Options to same origin See merge request !2103
* Revert "Merge remote-tracking branch 'dev/security-9-0' into 9-0-stable"Timothy Andrew2017-05-3041-990/+42
| | | | | This reverts commit f6ba1e081c96bd0a8c3561d92f97aa11d6688bc5, reversing changes made to 810cc51be37e03ebbe99711a53663956e4ffde8c.
* Merge remote-tracking branch 'dev/security-9-0' into 9-0-stableTimothy Andrew2017-05-3041-42/+990
|\
| * Only check new migrations in 'rake down_timecheck'Douwe Maan2017-05-261-1/+1
| | | | | | | | This is necessary for the `security-9-0` build to pass.
| * Merge branch 'dz-restrict-autocomplete' into 'security-9-1' Robert Speicher2017-05-263-11/+25
| | | | | | | | | | Allow users autocomplete by author_id only for authenticated users See merge request !2100
| * Merge branch '28917-contain-uploads-in-system-dir' into 'security'Douwe Maan2017-05-2635-30/+959
| | | | | | | | | | | | Upload files into `public/upload/system` instead of `public/upload` See merge request !2073
| * Merge branch 'dz-api-x-frame' into 'security-9-2'Robert Speicher2017-05-262-0/+5
|/ | | | | | Restrict API X-Frame-Options to same origin See merge request !2103
* Update VERSION to 9.0.7v9.0.7Lin Jen-Shin2017-05-051-1/+1
|
* Update CHANGELOG.md for 9.0.7Lin Jen-Shin2017-05-0510-36/+12
| | | [ci skip]
* Fix test errorLin Jen-Shin2017-05-051-1/+1
|
* Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-048-19/+105
| | | | | Use GroupsFinder to find subgroups the user has access to See merge request !2096
* Merge branch 'fix-hamlit-xss' into 'security-9-1' Robert Speicher2017-05-045-3/+29
| | | | | New Hamlit XSS fix, does not include extraneous changes See merge request !2095
* Merge branch 'snippets-finder-visibility' into 'security' Douwe Maan2017-05-0423-186/+389
| | | | | Refactor snippets finder & dont return internal snippets for external users See merge request !2094
* Merge branch 'branch-name-escape' into 'security' Robert Speicher2017-05-043-7/+19
| | | | | Fix XSS in branches dropdown See merge request !2093
* Merge branch '31157-respect-project-features-in-wiki-search' into 'security' Douwe Maan2017-05-043-3/+80
| | | | | Respect project features in wiki and blob search See merge request !2089
* Merge branch 'snippets_visibility' into 'security' Sean McGivern2017-05-044-215/+161
| | | | | Fix snippets visibility for show action - external users can not see internal snippets See merge request !2087
* Merge branch 'rs-sanitize-submodule-urls' into 'security' Douwe Maan2017-05-043-16/+46
| | | | | Sanitize submodule URLs before linking to them in the file tree view See merge request !2084
* Merge branch 'bvl-markup-pipeline' into 'security' Robert Speicher2017-05-047-32/+60
| | | | | Render asciidoc & other markup using banzai in a pipeline See merge request !2088
* Merge branch 'bvl-validate-urls-in-markdown-using-uri' into 'security' Robert Speicher2017-05-043-55/+70
| | | | | Add correct `rel` attributes to external links when rendering markdown See merge request !2086
* Update VERSION to 9.0.6v9.0.6James Lopez2017-04-211-1/+1
|
* Update CHANGELOG.md for 9.0.6James Lopez2017-04-2110-37/+12
| | | [ci skip]
* Merge branch '30779-show-mr-subnav-issue-tracker' into 'master'Alfredo Sumaran2017-04-2012-9/+41
| | | | | | | | Show sub-nav under Merge Requests when issue tracker is non-default Closes #30779 See merge request !10658
* Merge branch 'no-downtime-check-stable' into 'master' Robert Speicher2017-04-201-1/+7
| | | | | Don't run the downtime check on stable branches, or tags/master See merge request !10794
* Merge branch 'fix-dropdown-spec-failure-pipeline' into '9-0-stable' James Lopez2017-04-201-3/+3
|\ | | | | | | | | Fix dropdown spec failure pipeline See merge request !10829
| * Fix dropdown spec failure for merge when pipeline succeedsfix-dropdown-spec-failure-pipelineJose Ivan Vargas2017-04-201-3/+3
|/
* Merge branch 'fix/29125' into 'master' Sean McGivern2017-04-205-1/+40
| | | | | | | Port of fix/29125-ee to CE Closes #29125 See merge request !10796
* Merge branch 'plantuml-filter-after-highlight' into 'master' Sean McGivern2017-04-203-8/+12
| | | | | | | Fix PlantUML integration in GFM Closes #30557 See merge request !10651
* Merge branch '31137-ensure-yarn-installed' into 'master' Alfredo Sumaran2017-04-201-7/+0
| | | | | | | Remove node modules cache because we already use artifacts Closes #29226 and #31137 See merge request !10781
* fix migrationJames Lopez2017-04-191-0/+2
|
* fix migrationJames Lopez2017-04-191-0/+2
|
* Merge branch 'fix/orphan-notification-settings' into 'master'Yorick Peterse2017-04-194-2/+32
| | | | | | | | Fix orphaned notification settings Closes #29688 See merge request !10763
* fix migration failureJames Lopez2017-04-191-0/+2
|
* Merge branch 'zj-api-fix-build-events' into 'master' Rémy Coutable2017-04-194-9/+24
| | | | | | | Api fix build events rename to Job events Closes #30412 See merge request !10586
* Merge branch 'fix/project-visibility-setting' into 'master' Douwe Maan2017-04-193-5/+41
| | | | | | | Fix restricted visibility project setting Closes #30581 See merge request !10622
* Merge branch '2120-issues-search-bar-not-picking-up' into 'master' Annabel Dunstone Gray2017-04-192-1/+5
| | | | | | | Fix filtered search input width for IE Closes #30856 See merge request !10662
* Merge branch '29976-fix-dropping-job_id' into 'master' Kamil Trzciński2017-04-191-1/+1
| | | | | | | Do try to drop it if ci_builds.job_id isn't there Closes #29976 See merge request !10216
* Merge branch '30457-expire-note-destroy' into 'master'Sean McGivern2017-04-193-1/+16
| | | | | | | Fix issue's note cache expiration after delete Closes #30457 See merge request !10461
* Merge branch 'mr-widget-bug-fix' into 'master' Stan Hu2017-04-193-1/+19
| | | | | | | Fix the MR widget that merged any MR when choosing the option "Merge when pipeline succeeds" from the dropdown Closes #29568 See merge request !10611
* Update VERSION to 9.0.5v9.0.5James Lopez2017-04-101-1/+1
|
* Update CHANGELOG.md for 9.0.5James Lopez2017-04-104-12/+6
| | | [ci skip]