summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'svg-xss-fix' into 'security' Robert Speicher2017-02-132-2/+9
| | | | | Fix for XSS vulnerability in SVG attachments See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2059
* Merge branch 'fix/rename-group-export-vuln' into 'security' Robert Speicher2017-01-201-0/+20
| | | | | Fix export files not removed when a user takes over a namespace See merge request !2051
* Merge branch 'speed-up-group-milestone-index' into 'master' Sean McGivern2017-01-097-30/+66
| | | | | Speed up group milestone index by passing group_id to IssuesFinder See merge request !8363
* Merge branch 'remove-successful-pipeline-emails-for-now' into 'master' Sean McGivern2017-01-092-1/+8
| | | | | | | Make successful pipeline emails off for watchers Closes #24845 See merge request !8176
* Merge branch 'dz-whitelist-some-project-names' into 'master' Rémy Coutable2017-01-061-1/+1
| | | | | Whitelist next project names: assets, profile, public See merge request !8470
* 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-051-1/+2
| | | | | | | | | | 'master' Increases pipeline graph drowdown width in order to prevent strange position on chrome on ubuntu Closes #26218 See merge request !8399
* Merge branch 'fix/group-path-rename-error' into 'master' Douwe Maan2017-01-053-3/+11
| | | | | | | 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-0515-53/+49
| | | | | | | 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-051-2/+2
| | | | | Rename projects with reserved path names See merge request !8234
* Merge branch 'use-stable-icon-url' into 'master' Kamil Trzciński2017-01-052-2/+2
| | | | | 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 '26278-shaking-tab-pipelines-view' into 'master' Fatih Acet2017-01-051-2/+2
| | | | | | | Removes invalid html and unneeded CSS to prevent shaking in the pipelines tab Closes #26278 See merge request !8411
* Merge branch 'project-avatar-fork' into 'master' Sean McGivern2017-01-051-0/+11
| | | | | | | Copy, don't move uploaded avatar files Closes #26158 See merge request !8396
* Merge branch 'regression-note-headline-light' into 'master' Annabel Dunstone Gray2017-01-051-2/+10
| | | | | Fixed regression of note-headline-light where it was always placed on 2 lines, e… See merge request !8348
* Merge branch '24941-login-tabs-border' into 'master' Alfredo Sumaran2017-01-051-2/+2
| | | | | | | fix left border in session tabs Closes #24941 See merge request !8346
* Merge branch 'mentioned-but-not-closed-issues-messages' into 'master' Sean McGivern2017-01-051-5/+1
| | | | | | | Fix unclear closing issue behaviour on Merge Request show page Closes #26152 See merge request !8345
* Merge branch 'gfm-new-line-fix' into 'master' Fatih Acet2017-01-051-1/+1
| | | | | | | Fix GFM dropdown not showing at beginning of new lines Closes #26145 See merge request !8338
* Merge branch 'fix/mentioned-issue-text-grammar' into 'master' Sean McGivern2017-01-051-1/+1
| | | | | Fix grammar error in text about mentioned issues See merge request !8337
* Merge branch '25907-limited-container' into 'master' Fatih Acet2017-01-051-29/+31
| | | | | | | Only limit container width on issues & MRs within fixed-width container Closes #25907 See merge request !8330
* Merge branch '26126-cache-even-when-no-projects' into 'master' Yorick Peterse2017-01-051-1/+1
| | | | | | | Cache project authorizations even when user has access to zero projects Closes #26126 See merge request !8327
* Merge branch 'fix-latest-pipeine-ordering-again' into 'master' Kamil Trzciński2016-12-271-6/+3
| | | | | Order only for latest_successful_for See merge request !8301
* Revert "Merge branch 'fix-latest-pipeine-ordering' into 'master' "Robert Speicher2016-12-272-3/+6
| | | | This reverts commit bdcdf454be9e26c5e72104b810869aa67e0baf28.
* Revert "Merge branch 'fix-latest-pipeine-ordering-again' into 'master'"Robert Speicher2016-12-271-1/+1
| | | | This reverts commit a18ad6cf733ce9a466a32f32ea8e813f19caa3a5.
* Merge branch '26018-mini-pipeline-hover-cross-broswer' into 'master'Fatih Acet2016-12-271-71/+67
| | | | | | | | Resolve "Mini pipeline graph dropdown looks weird on Safari and hover does not work on firefox" Closes #26018, #26004, and #26002 See merge request !8282
* Merge branch 'fix-latest-pipeine-ordering-again' into 'master'Kamil Trzciński2016-12-271-1/+1
| | | | | | Order only for latest_successful_for See merge request !8301
* Merge branch 'fix-single-team' into 'master' Kamil Trzciński2016-12-271-1/+3
| | | | | Fix single team selection See merge request !8251
* Merge branch '26040-hide-scroll-top' into 'master' Fatih Acet2016-12-271-2/+2
| | | | | | | Hide Scroll Top button for failed Build page Closes #26040 See merge request !8295
* Merge branch '26026-pipeline-overflow-firefox' into 'master' Fatih Acet2016-12-271-3/+3
| | | | | | | Fix line breaking in nodes of the pipeline graph in firefox Closes #26026 See merge request !8292
* Merge branch '25930-discussion-actions-overlap-header-text' into 'master' Fatih Acet2016-12-272-12/+19
| | | | | | | Fix text overflow Closes #25930 See merge request !8273
* Merge branch ↵Douwe Maan2016-12-271-1/+3
| | | | | | | | | | '25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourcemap-file' into 'master' Resolve "Gitlab merge request view crash when commiting a js sourcemap file" Closes #25931 See merge request !8310
* Merge branch '26038-fix-confedential-warning-text-alignment' into 'master' Fatih Acet2016-12-271-1/+1
| | | | | | | fixes confidential warning alignment on comment box Closes #26038 See merge request !8293
* Merge branch 'auto-deploy-with-space' into 'master' Sean McGivern2016-12-271-2/+2
| | | | | | | Rename "autodeploy" to "auto deploy" Closes #25999 See merge request !8289
* Merge branch 'label-gfm-error-fix' into 'master' Fatih Acet2016-12-271-1/+1
| | | | | Fixed error with GFM autocomplete when no data exists See merge request !8288
* Merge branch 'fix-latest-pipeine-ordering' into 'master' Grzegorz Bizon2016-12-272-6/+3
| | | | | | | Fix code that selects latest pipelines Closes #25993 and #26031 See merge request !8286
* Merge branch '25909-fix-mr-list-timestamp-alignment' into 'master' Fatih Acet2016-12-271-1/+0
| | | | | | | Fixes timestamp text alignment in mr-list and issue-list Closes #25909 See merge request !8271
* Merge branch 'resolve-note-svg-color' into 'master' Annabel Dunstone Gray2016-12-271-6/+2
| | | | | Fixed discussion note resolve button SVG color See merge request !8250
* Revert "Merge branch '23638-remove-builds-tab' into 'master'"revert-79a816f3Kamil Trzciński2016-12-2615-14/+113
| | | This reverts merge request !7763
* Revert "Merge branch 'fix-latest-pipeine-ordering' into 'master'Douglas Barbosa Alexandre2016-12-232-3/+6
| | | | | | " This reverts commit 8dd85ca8347b00229364c2f6ea842934c09057b4.
* Merge branch 'issue_25887' into 'master' Douglas Barbosa Alexandre2016-12-233-8/+10
| | | | | | | Do not override incoming webhook channel for mattermost and slack Closes #25887 See merge request !8270
* Merge branch 'process-commit-worker-large-batches' into 'master' Douwe Maan2016-12-231-11/+13
| | | | | | | Improve ProcessCommitWorker for large push payloads Closes #25827 See merge request !8267
* Merge branch 'zj-slack-404-error' into 'master' Kamil Trzciński2016-12-231-1/+1
| | | | | | | Fix format of Slack when result is nil Closes #25954 See merge request !8248
* Merge branch '25905-mr-when-succeeds-dropdown' into 'master' Fatih Acet2016-12-231-0/+8
| | | | | | | Adds background color for disabled state to merge when succeeds dropdown Closes #25905 See merge request !8222
* Merge branch '25906-title-size' into 'master' Fatih Acet2016-12-232-1/+2
| | | | | | | Resolve "Titles are bigger than usual" Closes #25906 See merge request !8235
* Merge branch '25961-spec-list-blank' into 'master' Fatih Acet2016-12-233-5/+8
| | | | | | | Fix dropdown content non appearing in MR view Closes #25961 See merge request !8255
* Merge branch 'markdown-input-symbol-regex' into 'master' Jacob Schatz2016-12-231-3/+4
| | | | | Stops GFM special characters interfering with markdown tags See merge request !8265
* Merge branch 'fix-latest-pipeine-ordering' into 'master' Grzegorz Bizon2016-12-232-6/+3
| | | | | | | Fix code that selects latest pipelines Closes #25993 and #26031 See merge request !8286
* Merge branch 'fix-mattermost-username' into 'master' Douglas Barbosa Alexandre2016-12-221-1/+1
| | | | | Fix Mattermost command creation by specifying username See merge request !8257
* Merge branch 'fix/hide-retried-builds-in-pipeline-stage-dropdown' into 'master' Kamil Trzciński2016-12-221-1/+1
| | | | | | | Do not show retried builds in pipeline stage dropdown Closes #25980 See merge request !8260