summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 8.15.6v8.15.6Robert Speicher2017-02-141-1/+1
|
* Update CHANGELOG.md for 8.15.6Robert Speicher2017-02-145-16/+7
| | | [ci skip]
* Fix small rubocop issueRuben Davila2017-02-131-1/+1
|
* Fix migration with missing DOWNTIME entryRuben Davila2017-02-131-0/+2
|
* Merge branch 'fix-github-import-MR-wrong-project' into 'security' Robert Speicher2017-02-132-3/+11
| | | | | Fix labels being applied to wrong merge requests on GitHub import See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2064
* Merge branch 'svg-xss-fix' into 'security' Robert Speicher2017-02-135-3/+40
| | | | | Fix for XSS vulnerability in SVG attachments See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2059
* Merge branch 'fix-rdoc-xss' into 'security' Robert Speicher2017-02-133-0/+29
| | | | | Fix XSS in rdoc and other markups See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2058
* Merge branch 'asciidoctor-xss-patch' into 'security' Robert Speicher2017-02-133-0/+30
| | | | | Add sanitization filter to asciidocs output to prevent XSS See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2057
* Update VERSION to 8.15.5v8.15.5Robert Speicher2017-01-201-1/+1
|
* Update CHANGELOG.md for 8.15.5Robert Speicher2017-01-206-20/+8
| | | [ci skip]
* Add a changelog entry for #26242Robert Speicher2017-01-201-0/+4
|
* Merge branch 'upgrade-omniauth' into 'security' Robert Speicher2017-01-203-3/+7
| | | | | | | Upgrade OmniAuth Ruby gem to 1.3.2 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/26813 See merge request !2056
* Merge branch 'fix-guest-access-posting-to-notes' into 'security' Robert Speicher2017-01-203-10/+32
| | | | | Prevent users from creating notes on resources they can't access See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2054
* Merge branch 'fix-api-mr-permissions' into 'security' Robert Speicher2017-01-208-25/+66
| | | | | Ensure that only privileged users can access merge requests in the API See merge request !2053
* Merge branch 'fix/rename-group-export-vuln' into 'security' Robert Speicher2017-01-203-2/+91
| | | | | Fix export files not removed when a user takes over a namespace See merge request !2051
* Merge branch 'fix-users-deleting-public-deployment-keys' into 'security' Robert Speicher2017-01-202-3/+11
| | | | | Fix users being able to delete instance public deployment keys See merge request !2049
* Merge commit 'dev/8-15-stable' into 8-15-stableRuben Davila2017-01-1011-34/+64
|\
| * Update VERSION to 8.15.4v8.15.4Douglas Barbosa Alexandre2017-01-091-1/+1
| |
| * Update CHANGELOG.md for 8.15.4Douglas Barbosa Alexandre2017-01-098-28/+10
| | | | | | [ci skip]
| * Merge branch 'patch-turbolinks' into 'security'Robert Speicher2017-01-094-9/+57
|/ | | | | | Updated Turbolinks to patched version of turbolinks-classic See merge request !2048
* Merge branch 'update-gitlab-markup-gem' into 'master'Douglas Barbosa Alexandre2017-01-093-4/+8
| | | | | | Update the gitlab-markup gem to the version `1.5.1` See merge request !8509
* Merge branch 'fix-plain-text-emails' into 'master' Robert Speicher2017-01-091-2/+2
| | | | | | | Use #parts instead of #part to read all the parts of the Message. Closes #26463 See merge request !8507
* Merge branch 'support-google-cloud-storage-backups' into 'master' Stan Hu2017-01-094-1/+51
| | | | | | | Re-add Google Cloud Storage as a backup strategy Closes #26362 See merge request !8481
* Merge branch '26051-fix-missing-endpoint-route-method' into 'master' Rémy Coutable2017-01-094-3/+25
| | | | | | | Don't instrument 405 Grape calls Closes #26051 See merge request !8445
* Merge branch 'speed-up-group-milestone-index' into 'master' Sean McGivern2017-01-0910-46/+172
| | | | | Speed up group milestone index by passing group_id to IssuesFinder See merge request !8363
* Merge branch 'update-gitea-importer-doc' into 'master' Rémy Coutable2017-01-091-4/+1
| | | | | With Gitea v1.0.0, notes are imported See merge request !8298
* Merge branch '26014-fix-update-doc' into 'master' Achilleas Pipinellis2017-01-094-49/+87
| | | | | | | Re-order update steps in the 8.14 -> 8.15 upgrade guide Closes #26014 See merge request !8287
* Merge branch 'remove-successful-pipeline-emails-for-now' into 'master' Sean McGivern2017-01-094-2/+13
| | | | | | | Make successful pipeline emails off for watchers Closes #24845 See merge request !8176
* Update VERSION to 8.15.3v8.15.3Douglas Barbosa Alexandre2017-01-061-1/+1
|
* Update CHANGELOG.md for 8.15.3Douglas Barbosa Alexandre2017-01-0618-68/+20
| | | [ci skip]
* Merge branch 'fix-users-api-500-error' into 'master'Rémy Coutable2017-01-063-7/+16
| | | | | | | | Fix 500 errors when creating a user with identity via API Closes #26295 See merge request !8442
* Merge branch 'dz-whitelist-some-project-names' into 'master' Rémy Coutable2017-01-063-6/+5
| | | | | Whitelist next project names: assets, profile, public See merge request !8470
* Merge branch 'set_ldap_config_attributes_defaults' into 'master' Rémy Coutable2017-01-065-12/+45
| | | | | LDAP attributes needs default values See merge request !8465
* Merge branch 'minor-pipeline-graph-beautyfixes' into 'master'Fatih Acet2017-01-052-23/+108
| | | | | | big and mini pipeline css changes See merge request !8224
* Merge branch '26218-rety-button-pipeline-builds-name-drodown-broken' into ↵Fatih Acet2017-01-052-1/+6
| | | | | | | | | | 'master' Increases pipeline graph drowdown width in order to prevent strange position on chrome on ubuntu Closes #26218 See merge request !8399
* Merge branch 'issue_25889' into 'master'Sean McGivern2017-01-052-2/+27
| | | | | | | | Revert MattermostNotificationService and SlackNotificationService to MattermostS… Closes #25889 See merge request !8240
* Merge branch 'fix/group-path-rename-error' into 'master' Douwe Maan2017-01-057-10/+83
| | | | | | | Fix error 500 renaming group. Also added specs and changelog. Closes #17922 and #23223 See merge request !8201
* Merge branch 'fix/cross-project-ref-path' into 'master' Sean McGivern2017-01-0521-55/+73
| | | | | | | Fix cross-project references copy to include the project reference Closes #25890 See merge request !8232
* Merge branch 'dz-rename-reserved-project-names' into 'master' Dmitriy Zaporozhets2017-01-055-3/+189
| | | | | Rename projects with reserved path names See merge request !8234
* Merge branch 'use-stable-icon-url' into 'master' Kamil Trzciński2017-01-054-2/+8
| | | | | Use stable icon for Mattermost integration See merge request !8252
* Merge branch '25951-labels-are-not-consistent-on-all-pages' into 'master' Fatih Acet2017-01-051-6/+0
| | | | | | | Resolve "Labels are not consistent on all pages" Closes #25951 See merge request !8256
* Merge branch 'fix-double-line-issuable-page' into 'master' Annabel Dunstone Gray2017-01-051-0/+6
| | | | | Remove bottom border from Issuable titles See merge request !8278
* Merge branch 'api-hooks-changelog-entry' into 'master' Sean McGivern2017-01-051-0/+4
| | | | | Add changelog entry for renaming API param See merge request !8433
* Merge branch 'fix-api-project-hooks-params' into 'master' Sean McGivern2017-01-052-3/+4
| | | | | | | Fix project hooks params Closes #26291 See merge request !8425
* Merge branch 'ldap_person_attributes' into 'master' Robert Speicher2017-01-053-2/+65
| | | | | | | Gitlab::LDAP::Person uses LDAP attributes configuration Closes #26290 See merge request !8418
* Merge branch '26278-shaking-tab-pipelines-view' into 'master' Fatih Acet2017-01-052-2/+6
| | | | | | | Removes invalid html and unneeded CSS to prevent shaking in the pipelines tab Closes #26278 See merge request !8411
* Merge branch 'api-fix-extern-uid-validation' into 'master' Sean McGivern2017-01-052-3/+3
| | | | | | | API: extern_uid is a string Closes #26227 See merge request !8404
* Merge branch 'project-avatar-fork' into 'master' Sean McGivern2017-01-055-7/+35
| | | | | | | Copy, don't move uploaded avatar files Closes #26158 See merge request !8396
* Merge branch 'zj-404-slack-error' into 'master' Kamil Trzciński2017-01-052-36/+64
| | | | | | | Add API route slack slash commands Closes #25954 See merge request !8362
* Merge branch 'regression-note-headline-light' into 'master' Annabel Dunstone Gray2017-01-052-2/+14
| | | | | Fixed regression of note-headline-light where it was always placed on 2 lines, e… See merge request !8348