summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Laydown process for bugs and regressionsMek Stittri2018-07-261-28/+42
|
* Add excerpt for non-regressionsMek Stittri2018-07-261-0/+2
|
* Clarrify use of regression labelMek Stittri2018-07-261-0/+6
|
* Merge remote-tracking branch 'dev/master'Felipe Artur2018-07-2645-89/+303
|\
| * Merge branch '48617-promoting-milestone' into 'master'Felipe Artur Cardozo2018-07-265-2/+41
| |\ | | | | | | | | | | | | [master] Escapes milestone title shown in flash message when promoting a milestone See merge request gitlab/gitlabhq!2436
| | * Adds changelog entryFilipa Lacerda2018-07-171-0/+5
| | |
| | * Escapes milestone and label names when promoting themFilipa Lacerda2018-07-174-5/+30
| | |
| | * Escapes milestone title shown in flash message when promoting a milestoneFilipa Lacerda2018-07-132-2/+11
| | |
| * | Merge branch 'security-ide-branch-name-xss' into 'master'Felipe Artur Cardozo2018-07-263-1/+15
| |\ \ | | | | | | | | | | | | | | | | [master] Fixed XSS in branch name in Web IDE See merge request gitlab/gitlabhq!2431
| | * | Fixed XSS in branch name in Web IDEPhil Hughes2018-07-103-1/+15
| | | | | | | | | | | | | | | | #2691
| * | | Merge branch 'security-2690-fix-tooltip' into 'master'Felipe Artur Cardozo2018-07-2612-38/+195
| |\ \ \ | | | | | | | | | | | | | | | | | | | | [master] Escapes job name used in tooltips See merge request gitlab/gitlabhq!2427
| | * | | Escapes job name used in tooltips in vue componentsFilipa Lacerda2018-07-0612-38/+195
| | | | | | | | | | | | | | | | | | | | | | | | | Use sanitize to strip src attributes Changes sidebar back to use sanitize
| * | | | Merge branch 'security-fj-missing-csrf-system-hooks' into 'master'Felipe Artur Cardozo2018-07-266-5/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [master] Missing CSRF in System Hooks See merge request gitlab/gitlabhq!2419
| | * | | | Changing the hook test action to use POSTFrancisco Javier López2018-07-236-5/+10
| | | | | |
| * | | | | Update CHANGELOG.md for 11.0.5GitLab Release Tools Bot2018-07-261-0/+14
| | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Update CHANGELOG.md for 11.1.2GitLab Release Tools Bot2018-07-264-15/+18
| | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Merge remote-tracking branch 'origin/master' into dev-masterStan Hu2018-07-243-1/+18
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'security-event-counters-private-data' into 'master'Felipe Artur Cardozo2018-07-2419-38/+20
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Don't expose project names in various counters See merge request gitlab/gitlabhq!2418
| | * | | | | | Don't expose project names in various countersYorick Peterse2018-06-2119-38/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various counters would expose either project names, or full project paths (e.g. "gitlab-org/gitlab-ce"). This commit changes various places where we use "add_event" so we no longer expose (potentially) private information.
* | | | | | | | Merge branch 'mk/fix-callback-canceling-in-namespace-move-dir' into 'master'Stan Hu2018-07-263-6/+38
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix namespace move callback behavior, especially to fix Geo replication of namespace moves during certain exceptions Closes gitlab-ee#6252 See merge request gitlab-org/gitlab-ce!19297
| * | | | | | | | Fix namespace move callback behavior, especially to fix Geo replication of ↵Michael Kozono2018-07-263-6/+38
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | namespace moves during certain exceptions
* | | | | | | | Merge branch '48542-code-link' into 'master'Clement Ho2018-07-262-0/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "BS4: Link in code brackets has two different styles" Closes #48542 See merge request gitlab-org/gitlab-ce!20841
| * | | | | | | | Resolve "BS4: Link in code brackets has two different styles"Annabel Gray2018-07-262-0/+9
|/ / / / / / / /
* | | | | | | | Merge branch 'full-list-of-vulnerabilities-5239' into 'master'Phil Hughes2018-07-266-57/+46
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Full list of vulnerabilities See merge request gitlab-org/gitlab-ce!20855
| * | | | | | | | Full list of vulnerabilitiesSam Beckham2018-07-266-57/+46
|/ / / / / / / /
* | | | | | | | Merge branch 'remove-unnecessary-css' into 'master'Clement Ho2018-07-261-3/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove CSS See merge request gitlab-org/gitlab-ce!20845
| * | | | | | | | Remove CSSAnnabel Dunstone Gray2018-07-251-3/+0
| | | | | | | | |
* | | | | | | | | Merge branch 'update-danger-image' into 'master'Robert Speicher2018-07-261-4/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the image for the 'danger-review' job See merge request gitlab-org/gitlab-ce!20856
| * | | | | | | | | Update the image for the 'danger-review' jobRémy Coutable2018-07-261-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch '48055-web-ide-resize-handles' into 'master'Phil Hughes2018-07-264-9/+24
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Resize handles for Web IDE right sidebar are too thin" Closes #48055 See merge request gitlab-org/gitlab-ce!20818
| * | | | | | | | | | Fix Web IDE editor resizing on sidebar reset sizePaul Slaughter2018-07-251-0/+7
| | | | | | | | | | |
| * | | | | | | | | | Update resize handle to show lighter background on hover48055-web-ide-resize-handlesPaul Slaughter2018-07-251-1/+4
| | | | | | | | | | |
| * | | | | | | | | | Rename 'dragleft' and 'dragright' to 'drag-left' and 'drag-right'Paul Slaughter2018-07-243-5/+5
| | | | | | | | | | |
| * | | | | | | | | | Rename class dragHandle to drag-handlePaul Slaughter2018-07-243-4/+4
| | | | | | | | | | |
| * | | | | | | | | | Resize drag handle for Web IDEPaul Slaughter2018-07-242-1/+6
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '48636-new-mr-card-styles' into 'master'Clement Ho2018-07-263-1/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "BS4: Create new Merge request boxes have different styles" Closes #48636 See merge request gitlab-org/gitlab-ce!20822
| * | | | | | | | | | | Resolve "BS4: Create new Merge request boxes have different styles"Annabel Gray2018-07-263-1/+8
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '49107-prefetching-of-assets-and-cdn-domain' into 'master'Clement Ho2018-07-263-0/+43
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DNS Prefetching + Preconnect of assets_host (CDN Domain) Closes #49107 See merge request gitlab-org/gitlab-ce!20781
| * | | | | | | | | | | DNS Prefetching + Preconnect of assets_host (CDN Domain)Tim Zallmann2018-07-263-0/+43
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'ide-delete-entries' into 'master'Tim Zallmann2018-07-2636-116/+545
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable deleting files in the Web IDE See merge request gitlab-org/gitlab-ce!20595
| * | | | | | | | | | Enable deleting files in the Web IDEPhil Hughes2018-07-2636-116/+545
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '49614-dynamic-component-in-report-issue' into 'master'Phil Hughes2018-07-268-60/+110
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make report_issues.vue easily extendable Closes #49614 See merge request gitlab-org/gitlab-ce!20843
| * | | | | | | | | | Make report_issues.vue easily extendableLukas Eipert2018-07-268-60/+110
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'wrap-job-name-on-jobs-sidebar' into 'master'Tim Zallmann2018-07-262-0/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap job name on pipeline job sidebar Closes #49540 See merge request gitlab-org/gitlab-ce!20804
| * | | | | | | | | | Wrap job name on pipeline job sidebarGeorge Tsiolis2018-07-242-0/+6
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'winh-fail-slow-karma-tests' into 'master'Tim Zallmann2018-07-261-0/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fail Karma tests that take longer than a second Closes #44174 See merge request gitlab-org/gitlab-ce!20518
| * | | | | | | | | | | Fail Karma tests that take longer than a secondWinnie Hellmann2018-07-231-0/+13
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sh-bump-haml-5.0.4' into 'master'Rémy Coutable2018-07-262-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump haml gem to 5.0.4 See merge request gitlab-org/gitlab-ce!20847
| * | | | | | | | | | | | Bump haml gem to 5.0.4Stan Hu2018-07-252-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As pointed out in #49625, this version is needed to support Ruby 2.5. See https://github.com/haml/haml/blob/master/CHANGELOG.md for more details.
* | | | | | | | | | | | | Merge branch '49631-fix-dangerfile-schema-rb' into 'master'Rémy Coutable2018-07-261-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Dangerfile reporting that db/schema.rb wasn't updated" Closes #49631 See merge request gitlab-org/gitlab-ce!20852