summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'winh-replty-to-comment-tooltip' into 'master'Clement Ho2019-03-201-1/+1
| | | | | | | | | | | Move reply to comment tooltip to the top Closes #59198 See merge request gitlab-org/gitlab-ce!26366 (cherry picked from commit 75e24b8f506444bfdac57fd0d8d691e49fb77dc1) 6f4c0178 Move reply to comment tooltip to the top
* Merge branch '56970-fix-mr-stuck-loading-on-error' into 'master'Phil Hughes2019-03-192-5/+9
| | | | | Resolve "Merge request page loses state" See merge request gitlab-org/gitlab-ce!25988
* Revert "Merge branch '7861-cross-project-pipeline-dashboard-mvc-ce-backport' ↵John Jarvis2019-03-191-80/+0
| | | | | | | into 'master'" This reverts commit 99b813ddcd51c125b342fe6b8d2a847a84993621, reversing changes made to bc6cc878d9c82a221c55e08f62a7bec200b7392b.
* Merge branch '7861-cross-project-pipeline-dashboard-mvc-ce-backport' into ↵Filipa Lacerda2019-03-191-0/+80
| | | | | | | 'master' Backport EE CSS addition See merge request gitlab-org/gitlab-ce!25874
* Merge branch 'sh-fix-ssh-pull-mirorrs-ce' into 'master'Nick Thomas2019-03-191-0/+8
| | | | | | | Backport EE JavaScript changes for SSH pull mirrors Closes #56340 See merge request gitlab-org/gitlab-ce!26308
* Merge branch 'id-skip-prepopulating-for-any-none' into 'master'Phil Hughes2019-03-191-2/+2
| | | | | | | | | Fix skipping of user rendering for none and any See merge request gitlab-org/gitlab-ce!26268 (cherry picked from commit 142c39aee6e0e3fb8e73d6eb818e49ef7795cfc4) 4eb70b90 Fix skipping of user rendering for none and any
* Merge branch 'psimyn-incident-report-section-ce' into 'master'Mike Greiling2019-03-191-1/+4
| | | | | | | | | | CE backport of Add Incidents section to Operations settings See merge request gitlab-org/gitlab-ce!25939 (cherry picked from commit 11c8b5a18b6bfc822042d0748dcb6b04f11c1337) f87517e0 Add Incidents section to Operations settings a28742ad Add feature specs for settings page
* Merge branch '48324-enable-squash-message-on-fast-forward' into 'master'Phil Hughes2019-03-142-39/+56
| | | | | | | Allow modifying squash commit message for fast-forward only merge method Closes #48324, #58805, and #58631 See merge request gitlab-org/gitlab-ce!26017
* Revert "Merge branch 'tz-reorganise-digests-json' into 'master'"Tim Zallmann2019-03-141802-205/+99
| | | | Reverts the loading of emojis and its images to move forward with RC
* Merge branch 'tz-load-emojis-from-server-not-cdn' into 'master'Filipa Lacerda2019-03-131-4/+1
| | | | | Removes the CDN loading for emojis.json See merge request gitlab-org/gitlab-ce!26102
* Merge branch 'ce-9826-fix-broken-downstreams' into 'master'Kamil Trzciński2019-03-132-3/+17
| | | | | | | | | CE port for expanded pipelines See merge request gitlab-org/gitlab-ce!25859 (cherry picked from commit 71dbd613982c6f247b3897e2d012a261904178a4) 2dbf3da2 CE port for expanded pipelines
* Merge branch 'tz-remove-csrf-token-for-emojis-json' into 'master'Mike Greiling2019-03-111-1/+9
| | | | | | | | | | | Removes the CSRF token if the emojis.json is on a CDN Closes #58784 See merge request gitlab-org/gitlab-ce!25979 (cherry picked from commit fcf632ef99fee06de42216e769ddfeb28967f17c) cf2b0dc5 Removes the CSRF token if the emojis.json is on a CDN
* Merge branch 'sitcky-prefix-fix' into 'master'Filipa Lacerda2019-03-113-0/+6
| | | | | | | | | | | Fixed sticky bar styling in Safari Closes #58625 See merge request gitlab-org/gitlab-ce!25913 (cherry picked from commit c8116ebda8cfb1176d56ff371062e7564e969022) cf05e49f Fixed sticky bar styling in Safari
* Revert "Merge branch 'remove-select2-rails' into 'master'"Marin Jankovski2019-03-081-1/+1
| | | This reverts merge request !17871
* Merge branch '58649-project-template-for-android' into 'master'Sean McGivern2019-03-081-0/+4
|\ | | | | | | | | | | | | Resolve "Project template for Android" Closes #58649 See merge request gitlab-org/gitlab-ce!25870
| * Add Android templateJason Lenny2019-03-071-0/+4
| |
* | remove select2-rails (select2 is now installed via yarn)Praveen Arimbrathodiyil2019-03-081-1/+1
| |
* | Merge branch 'ingress-hostnames' into 'master'Mike Greiling2019-03-082-71/+66
|\ \ | | | | | | | | | | | | | | | | | | Add support for ingress hostnames Closes #58244, #56158, and #46691 See merge request gitlab-org/gitlab-ce!25181
| * | Add support for ingress hostnamesingress-hostnameswalkafwalka2019-03-072-71/+66
| |/
* | Merge branch '9224-create-mr-from-vulnerabilty-feedback-fe' into 'master'Luke Bennett2019-03-081-2/+4
|\ \ | | | | | | | | | | | | Fixes split button styling in modal footers (CE port) See merge request gitlab-org/gitlab-ce!25869
| * | Fixes split button styling in modal footerssamdbeckham2019-03-071-2/+4
| | |
* | | Provide EE backports for filtering by approver featureIgor2019-03-079-265/+308
| |/ |/| | | | | | | Adds custom validator for ArrayNoneAny param Extracts some logic in js into separate files
* | Display Ancestors in Issuable SidebarRajat Jain2019-03-071-0/+52
| |
* | Merge branch '46464-improve-stop-pipeline-modal' into 'master'Kushal Pandya2019-03-073-35/+104
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Improve stop pipeline modal" Closes #46464 See merge request gitlab-org/gitlab-ce!25059
| * | Emit submit event instead of passing handlermfluharty2019-03-072-6/+7
| | |
| * | Add information to "Stop pipeline" confirm modalmfluharty2019-03-073-35/+103
| | | | | | | | | | | | | | | | | | Make it its own component Show pipeline status and link to pipeline Show commit short hash, link, and message
* | | Resolve "Project template for iOS"Jason Lenny2019-03-071-0/+4
| | |
* | | Revert "Merge branch 'id-1951-filter-merge-requests-by-approvers' into 'master'"Igor2019-03-079-308/+265
| | | | | | | | | | | | This reverts merge request !24982
* | | Merge branch 'fix-blob-editor-deleting-content' into 'master'Filipa Lacerda2019-03-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed the blob editor deleting all content for files Closes #58578 See merge request gitlab-org/gitlab-ce!25865
| * | | Fixed the blob editor deleting all content for filesPhil Hughes2019-03-071-1/+1
| | |/ | |/| | | | | | | | | | | | | This only happens for files that the path consists of only numbers Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58578
* | | Merge branch '56937-edit-knative-domain' into 'master'Grzegorz Bizon2019-03-075-78/+161
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Edit Knative domain after it has been deployed Closes #56937 See merge request gitlab-org/gitlab-ce!25386
| * | | Add ability to edit Knative domainjerasmus2019-03-055-78/+161
| | | | | | | | | | | | | | | | Added the functionality to edit the Knative domain
* | | | Resolve "Jobs tab border top in pipeline's page is 1px off"Miranda Fluharty2019-03-072-5/+6
| | | |
* | | | Merge branch 'expand-diff-to-full-file' into 'master'Douwe Maan2019-03-078-9/+187
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Expand diff to entire file Closes #19054 See merge request gitlab-org/gitlab-ce!24406
| * | | Add option to expand diff to full filePhil Hughes2019-03-068-9/+187
| | | | | | | | | | | | | | | | | | | | | | | | The user can also toggle between the diff changes and the full file diff. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19054
* | | | Moves shared quota getter into CEFilipa Lacerda2019-03-072-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | In jobs store, moves the check for `shouldRenderSharedRunnerLimitWarning` to the CE codebase.
* | | | Fix cluster health chartsAdriel Santiago2019-03-072-29/+84
| | | | | | | | | | | | | | | | Render both usage and capacity in chart
* | | | Use gitlab-ci job name in environment dropdownMiranda Fluharty2019-03-071-2/+1
| | | | | | | | | | | | | | | | | | | | Use plain job name in the "Deploy to..." dropdown Both in the old haml template and in the new vue component
* | | | Moved all emojis to the public folderTim Zallmann2019-03-071802-99/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created new emojis map in public folder Renamed folder to emojis Loading now the emojis from Localstorage or from Server Moved all emojis to the public folder Loading the emojis.json file now through AJAX Loads now the map in the web element instead when building the emoji tag Updated the custom Element Setup to modern method Fixed Emoji Karma Specs for async loading Loading now the emojis from Localstorage or from Server Loads now the map in the web element instead when building the emoji tag Fixed problem with FIXTURE_PATH for emojis fixtures Fixes Linting Error in gemojione.rake Fixed Emoji Karma Specs Fix static type check in gemojione and check if already registered Testing if the Emoji Support Check is failing Rspec Change of CLass Name, returning true on check to test Fixes failing Emoji RSpec Tests Moved Emojis into public/-/emojis/1/ Fixed Linting Errors in gl_emoji Fix to fixtures creation for emojis Fixed path spec for new subdirectory -/emojis Optimized emojis.json output Fix for Emoji Spec failure due to unicode dataset Better catch handling for emojis
* | | | Added a condition on squash message displayNatalia Tepluhina2019-03-072-2/+1
| | | | | | | | | | | | | | | | - also added a caret back to GlDropdown
* | | | Improve files_decorator performancePaul Slaughter2019-03-075-152/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **How?** Previously the files_decorator inserted parent folders inefficiently. It started at the first part and ensured each was inserted. Since the file entries are given to use in alphabetical order, we can start at the last part of the blob's parents. If this exists, we can short circuit and be done inserting parents. **What else?** - Improve performance of decorateData. The object spread operator is not needed because the object is brand new.
* | | | Merge branch '30299-transform-notes-from-polling-response' into 'master'Phil Hughes2019-03-071-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Handle transformed notes from polling response See merge request gitlab-org/gitlab-ce!25792
| * | | | Handle transformed notes from polling responseHeinrich Lee Yu2019-03-061-0/+4
| | | | | | | | | | | | | | | | | | | | Transforms notes when the note was transformed in some other tab
* | | | | Provide EE backports for filtering by approver featureIgor2019-03-079-255/+299
| | | | | | | | | | | | | | | | | | | | | | | | | Adds custom validator for ArrayNoneAny param Extracts some logic in js into separate files
* | | | | Merge branch '7714-boards-fe' into 'master'Kushal Pandya2019-03-074-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Display Recent Boards in Board switcher See merge request gitlab-org/gitlab-ce!25696
| * | | | | Porting changes from EERajat Jain2019-03-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Extract 445px as a variable - Documentation changes: new image and update copy
| * | | | | Display Recent Boards in Board switcherRajat Jain2019-03-043-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new Recent section in the board switcher along with a All section which like old times display all the available boards. Recent section lists the recent 5 boards you have visited for a quick switch.
* | | | | | Merge branch 'ce-billings-gold-trial-callout-fe-persistent-callout' into ↵Tim Zallmann2019-03-065-9/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' CE FE Refactor PersistentUserCallout instantiation See merge request gitlab-org/gitlab-ce!25484
| * | | | | | Refactor PersistentUserCallout instantiationsLuke Bennett2019-03-065-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses a new factory method to DRY instantiation.
* | | | | | | Merge branch 'ee-parallel-diff-view-ce' into 'master'Filipa Lacerda2019-03-062-0/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport of ee-parallel-diff-view See merge request gitlab-org/gitlab-ce!25734
View Lorry Controller Status