summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'diff-fuzzy-file-finder-feature-flag' into 'master'Filipa Lacerda2019-02-081-13/+57
|\ | | | | | | | | | | | | Adds a feature flag to the diff fuzzy file finder Closes #57403 See merge request gitlab-org/gitlab-ce!25006
| * Adds a feature flag to the diff fuzzy file finderPhil Hughes2019-02-081-13/+57
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57403
* | Update `chart.js` to 2.7.2Andrew Fontaine2019-02-083-66/+171
| |
* | Merge branch 'mr-web-worker-origin' into 'master'Filipa Lacerda2019-02-083-10/+14
|\ \ | | | | | | | | | | | | Fixes diff web worker not loading in staging See merge request gitlab-org/gitlab-ce!25039
| * | Fixes diff web worker not loading in stagingPhil Hughes2019-02-083-10/+14
| | | | | | | | | | | | https://gitlab.com/gitlab-org/quality/staging/issues/34
* | | Refactor draft_note_spec.js to Vue test utils (CE backport)Winnie Hellmann2019-02-081-0/+1
|/ /
* | Move permission check of manual actions of deploymentsShinya Maeda2019-02-087-39/+3
| |
* | Upgrade cluster applications, starting with runnerThong Kuah2019-02-076-6/+205
| |
* | Merge branch 'jlenny-AddPagesTemplates' into 'master'Douglas Barbosa Alexandre2019-02-072-11/+24
|\ \ | | | | | | | | | | | | | | | | | | Pages templates on the new project templates menu Closes #47857 See merge request gitlab-org/gitlab-ce!24906
| * | Project template: Fall back to GitLab logojlenny-AddPagesTemplatesLukas Eipert2019-02-072-16/+9
| | | | | | | | | | | | | | | Use gitlab-svg to provide the icons for rails, spring and express. For the new GitLab pages templates, we are falling back to the GitLab logo.
| * | Add Pages templatesJason Lenny2019-02-071-0/+20
| |/ | | | | | | | | | | | | Adds templates for the 5 most popular Pages templates to the new project menu. This does not add unique icons for the templates because that turned out more complicated than expected, and this feature is valuable without them.
* | Merge branch 'tooltips-to-top' into 'master'Filipa Lacerda2019-02-074-11/+5
|\ \ | | | | | | | | | | | | | | | | | | Change spawning of tooltips to be top by default Closes #39044 and #48581 See merge request gitlab-org/gitlab-ce!21223
| * | Changed default tooltip position to be top, instead of bottomtooltips-to-topDimitrie Hoekstra2019-02-064-11/+5
| | | | | | | | | | | | | | | | | | - Tooltips, by default, will display at the top of the element, instead of at the bottom - Note actions and emoji awards tooltips are now top-positioned
* | | Merge branch '19745-new-tasklists-for-merge-requests' into 'master'Sean McGivern2019-02-072-4/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable fast task lists for merge requests Closes #19745 See merge request gitlab-org/gitlab-ce!24779
| * | | Add fast tasklist support to MR tasklistFatih Acet2019-02-072-4/+18
| | | | | | | | | | | | | | | | Also adds specs and fixes existing specs
* | | | Merge branch 'master' into ↵Sean McGivern2019-02-079-145/+359
|\ \ \ \ | | | | | | | | | | | | | | | fabsrc/gitlab-ce-2105-add-setting-for-first-day-of-the-week
| * | | | Resolve "Override squash commit message"Natalia Tepluhina2019-02-079-145/+359
| | |_|/ | |/| |
* | | | Merge branch 'master' into ↵Sean McGivern2019-02-0715-49/+152
|\ \ \ \ | |/ / / | | | | | | | | fabsrc/gitlab-ce-2105-add-setting-for-first-day-of-the-week
| * | | Merge branch '56543-project-lists-further-iteration-improvements' into 'master'Annabel Dunstone Gray2019-02-073-9/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project lists: further iteration & improvements" Closes #56543 See merge request gitlab-org/gitlab-ce!24855
| | * | | Improve project list UX on large screensMartin Wortschack2019-02-073-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove star button from project list - Switch to columns on desktop - Hide MR and issues on screens < 1200px - Remove not needed utility classes - Change avatar size to 48px - Set line-height of title row to 20px
| * | | | Merge branch 'fix-repo-settings-file-upload-error' into 'master'Nick Thomas2019-02-071-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug causing repository mirror settings UI to break Closes #55134 See merge request gitlab-org/gitlab-ce!23712
| | * | | | Fix bug causing repo mirror settings UI to breakfix-repo-settings-file-upload-errorLuke Bennett2019-01-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an exception relating to the new project cleanup settings in 11.6 that causes the mirror repo settings UI to become unusable.
| * | | | | Merge branch 'ee-8346-hide-unlicensed-alerts' into 'master'Fatih Acet2019-02-072-4/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport to resolve conflicts for gitlab-ee!9224 See merge request gitlab-org/gitlab-ce!24889
| | * | | | | Use ee_else_ce alias for monitoring_bundleee-8346-hide-unlicensed-alertsSimon Knox2019-02-072-4/+4
| | | |_|/ / | | |/| | |
| * | | | | Merge branch ↵Phil Hughes2019-02-077-21/+102
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '52347-lines-changed-statistics-is-not-easily-visible-in-mr-changes-view' into 'master' Resolve "Lines changed statistics is not easily visible in MR changes view" Closes #52347 See merge request gitlab-org/gitlab-ce!24569
| | * | | | | Clearly display diff statistics for MRs52347-lines-changed-statistics-is-not-easily-visible-in-mr-changes-viewSam Bigelow2019-02-067-21/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put the statistics in the compare-versions header for the entire MR Put them in the file header for each individual file
| * | | | | | Remove ECharts metrics dashboard feature flagAdriel Santiago2019-02-071-2/+2
| | |/ / / / | |/| | | |
| * | | | | Correct file-header spacing on compare pageSam Bigelow2019-02-063-13/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use special classes when is_compare, similar to is_commit. Default expectation is diff is being viewed in MR
* | | | | | Add setting for first day of the weekFabian Schneider2019-02-067-3/+32
|/ / / / /
* | | | | Reduce Bundle Size by lazy loading markdown-itTim Zallmann2019-02-062-30/+45
| |_|_|/ |/| | |
* | | | Allow custom squash commit messagesLuke Duncalfe2019-02-061-2/+2
| | | |
* | | | Add reply to notes to turn into discussionsHeinrich Lee Yu2019-02-068-2/+97
| | | |
* | | | Merge branch 'knative-list' into 'master'Phil Hughes2019-02-067-84/+172
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Modify Serverless Listing See merge request gitlab-org/gitlab-ce!24072
| * | | | Modified Knative list view to provide more detailsChris Baumbauer2019-02-057-84/+172
| | | | |
* | | | | Merge branch 'adriel-add-metrics-chart-tooltips' into 'master'Phil Hughes2019-02-061-3/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add metrics chart tooltips See merge request gitlab-org/gitlab-ce!24651
| * | | | | Add chart tooltipsAdriel Santiago2019-02-051-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | Use tooltips for metrics graph data
* | | | | | Merge branch 'create-svg-wrapper-css-class' into 'master'55312-use-import-export-issues-illustration-from-gitlab-svgsPhil Hughes2019-02-061-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Add square css class See merge request gitlab-org/gitlab-ce!24875
| * | | | | Add square css classPaul Slaughter2019-02-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** This is helpful when needing to wrap the size of an svg with an empty container. Example: ``` <div class="square s-32 d-flex-center"> <svg class="s16">...</svg> </div> ```
* | | | | | Resolve "Update project topics styling to use badges design"Brandon Labuschagne2019-02-051-0/+4
| |/ / / / |/| | | |
* | | | | Merge branch 'adriel-use-svg-icon-for-deployment-series' into 'master'Phil Hughes2019-02-052-0/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use SVG icon for deployment series See merge request gitlab-org/gitlab-ce!24652
| * | | | | Use svg icon for deployment seriesAdriel Santiago2019-02-052-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | Use the rocket GitLab SVG to show deployment data
* | | | | | Merge branch 'diff-file-finder' into 'master'Filipa Lacerda2019-02-0514-141/+256
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added fuzzy file finder to merge requests Closes #53304 See merge request gitlab-org/gitlab-ce!24434
| * | | | | | Added fuzzy file finder to merge requestsPhil Hughes2019-02-0514-141/+256
| |/ / / / / | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53304
* | | | | | Merge branch 'jprovazn-remove-redcarpet' into 'master'Grzegorz Bizon2019-02-0511-74/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Redcarpet markdown engine Closes #51374 See merge request gitlab-org/gitlab-ce!24819
| * | | | | Remove Redcarpet markdown engineJan Provaznik2019-02-0411-74/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This engine was replaced with CommonMarker in 11.4, it was deprecated since then.
* | | | | | Merge branch 'fe-grammar-util' into 'master'Phil Hughes2019-02-051-0/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | FE grammar util See merge request gitlab-org/gitlab-ce!24893
| * | | | | | Add grammar utilPaul Slaughter2019-02-041-0/+40
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | This contains the function `toNounSeriesText` which can be used to build i18n noun series fragments (i.e. "A, B, and C").
* | | | | | Extract ReplyPlaceholder from NoteableDiscussion componentWinnie Hellmann2019-02-052-8/+20
| | | | | |
* | | | | | Merge branch 'adriel-add-deployment-data' into 'master'Phil Hughes2019-02-052-0/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add deployment data to metrics graphs See merge request gitlab-org/gitlab-ce!24650
| * | | | | | Add deployment dataAdriel Santiago2019-02-042-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds scatter type series to metrics graph for deployments
View Lorry Controller Status