summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* get `-f` to work again for EE files3871-get-karma-file-filter-to-work-againLukas Eipert2018-07-271-16/+20
* Merge branch '48567-the-comparison-list-for-the-modified-icons' into 'master'Phil Hughes2018-07-2712-17/+17
|\
| * Resolve "The comparison list for the modified icons"Sam Beckham2018-07-2712-17/+17
|/
* Merge branch 'gitaly-mandatory-fetch-ref' into 'master'Sean McGivern2018-07-276-33/+17
|\
| * More Gitaly cleanup: fetch_ref, allow disk access blocksJacob Vosmaer (GitLab)2018-07-276-33/+17
|/
* Merge branch 'rails5-update-gemfile-lock-2' into 'master'Rémy Coutable2018-07-272-6/+12
|\
| * Rails5 update Gemfile.rails5.lockJasper Maes2018-07-262-6/+12
* | 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
| |\ \
| | * | 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
| |\ \ \
| | * | | Fixed XSS in branch name in Web IDEPhil Hughes2018-07-103-1/+15
| * | | | Merge branch 'security-2690-fix-tooltip' into 'master'Felipe Artur Cardozo2018-07-2612-38/+195
| |\ \ \ \
| | * | | | Escapes job name used in tooltips in vue componentsFilipa Lacerda2018-07-0612-38/+195
| * | | | | Merge branch 'security-fj-missing-csrf-system-hooks' into 'master'Felipe Artur Cardozo2018-07-266-5/+10
| |\ \ \ \ \
| | * | | | | 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
| * | | | | | Update CHANGELOG.md for 11.1.2GitLab Release Tools Bot2018-07-264-15/+18
| * | | | | | 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
| |\ \ \ \ \ \ \
| | * | | | | | | Don't expose project names in various countersYorick Peterse2018-06-2119-38/+20
* | | | | | | | | 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 na...Michael Kozono2018-07-263-6/+38
|/ / / / / / / / /
* | | | | | | | | Merge branch '48542-code-link' into 'master'Clement Ho2018-07-262-0/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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 vulnerabilitiesSam Beckham2018-07-266-57/+46
|/ / / / / / / / /
* | | | | | | | | Merge branch 'remove-unnecessary-css' into 'master'Clement Ho2018-07-261-3/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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' jobRémy Coutable2018-07-261-4/+3
* | | | | | | | | | | Merge branch '48055-web-ide-resize-handles' into 'master'Phil Hughes2018-07-264-9/+24
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | 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"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)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 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 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 sidebarGeorge Tsiolis2018-07-242-0/+6
* | | | | | | | | | | Merge branch 'winh-fail-slow-karma-tests' into 'master'Tim Zallmann2018-07-261-0/+13
|\ \ \ \ \ \ \ \ \ \ \