summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Fixes for ESLint Errorstz-ide-open-mrTim Zallmann2018-03-272-4/+12
|
* Fixed Path to tooltip directiveTim Zallmann2018-03-271-1/+1
|
* Added Changes based on UX ReviewTim Zallmann2018-03-279-63/+100
|
* Re added The Web IDE ButtonTim Zallmann2018-03-261-43/+54
|
* Fixes for Tests on file.js and tabs testsTim Zallmann2018-03-251-23/+20
|
* Fix for MR Widget Header resetTim Zallmann2018-03-251-43/+43
|
* Fixes to Formatting to all FilesTim Zallmann2018-03-2514-202/+32
|
* ESLint + Karma fixesTim Zallmann2018-03-256-82/+26
|
* Fixed new AdditionsTim Zallmann2018-03-257-11/+15
| | | | Automatic Diff Navigation
* Actual MR diff displayedTim Zallmann2018-03-2516-339/+195
|
* Basic Setup for MR ShowingTim Zallmann2018-03-2523-314/+1006
|
* Merge branch 'winh-cleanup-comment-submit-test' into 'master'Clement Ho2018-03-231-3/+3
|\ | | | | | | | | Cleanup test for disabling comment submit button See merge request gitlab-org/gitlab-ce!17930
| * Cleanup test for disabling comment submit buttonwinh-cleanup-comment-submit-testWinnie Hellmann2018-03-221-3/+3
| |
* | Merge branch ↵Filipa Lacerda2018-03-231-10/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '44218-add-internationalization-support-for-the-prometheus-merge-request-widget' into 'master' Resolve "Add internationalization support for the Prometheus Merge Request widget" Closes #44218 See merge request gitlab-org/gitlab-ce!17753
| * | Add i18n support for the mrWidget prometheus memory widget44218-add-internationalization-support-for-the-prometheus-merge-request-widgetJose Ivan Vargas2018-03-231-10/+20
| | |
* | | Merge branch 'performance-bar-vue-resource' into 'master'Filipa Lacerda2018-03-232-0/+25
|\ \ \ | | | | | | | | | | | | | | | | Add Vue resource interceptor to performance bar See merge request gitlab-org/gitlab-ce!17915
| * | | fixed eslintperformance-bar-vue-resourcePhil Hughes2018-03-211-1/+0
| | | |
| * | | Add Vue resource interceptor to performance barPhil Hughes2018-03-212-0/+26
| | | |
* | | | Merge branch 'winh-deprecate-old-modal' into 'master'Filipa Lacerda2018-03-2310-132/+150
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Rename modal.vue to deprecated_modal.vue See merge request gitlab-org/gitlab-ce!17438
| * | | | Rename modal.vue to deprecated_modal.vuewinh-deprecate-old-modalWinnie Hellmann2018-03-2210-132/+150
| | |_|/ | |/| |
* | | | Merge branch '44382-ui-breakdown-for-create-merge-request' into 'master'Clement Ho2018-03-221-6/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI breakdown of message of the last pushed branch for Create merge request Closes #44382 See merge request gitlab-org/gitlab-ce!17821
| * | | | Fix UI breakdown for Create merge request buttonTakuya Noguchi2018-03-231-6/+3
| | | | |
* | | | | Resolve "Some dropdowns have two scroll bars."Dennis Tang2018-03-225-4/+40
| |_|_|/ |/| | |
* | | | Merge branch '44386-better-ux-for-long-name-branches' into 'master'Phil Hughes2018-03-221-2/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Poor UX with branch whose name is very long on Branches Closes #44386 See merge request gitlab-org/gitlab-ce!17832
| * | | | UX re-design branch items with flexboxTakuya Noguchi2018-03-221-2/+19
| | | | |
* | | | | Merge branch 'backport-4006-add-weight-indicator-to-issues-board' into 'master'Clement Ho2018-03-221-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport 4006 add weight indicator to issues board See merge request gitlab-org/gitlab-ce!17923
| * | | | | backport dependency import change in issue_card_inner.jsbackport-4006-add-weight-indicator-to-issues-boardDennis Tang2018-03-211-2/+2
| | | | | |
* | | | | | Prevent overflow of long instance urls during Project creationLukas Eipert2018-03-221-20/+30
| | | | | |
* | | | | | Fix class nameFilipa Lacerda2018-03-221-1/+1
| | | | | |
* | | | | | Merge branch 'master' into '44453-performance-bar-modalbox'44453-performance-bar-modalboxPhil Hughes2018-03-2214-194/+241
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | # Conflicts: # app/assets/javascripts/performance_bar/components/detailed_metric.vue
| * | | | | Merge branch 'performance-bar-position-fix' into 'master'Filipa Lacerda2018-03-226-48/+58
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix performance bar spacing See merge request gitlab-org/gitlab-ce!17912
| | * | | | | removed check for hostPhil Hughes2018-03-214-35/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | changed wrapper to container with correct widths
| | * | | | | Fix performance bar spacingPhil Hughes2018-03-214-15/+33
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'disable-btn-mr-when-posting-comment' into 'master'Fatih Acet2018-03-211-2/+3
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Disables the button when submitting comment. Closes #39661 See merge request gitlab-org/gitlab-ce!17918
| | * | | | Disables the button when submitting comment.Jacob Schatz2018-03-211-2/+3
| | | | | |
| * | | | | Merge branch 'refactor/move-time-tracking-vue-components' into 'master'Filipa Lacerda2018-03-213-98/+104
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move TimeTrackingCollapsedState vue component See merge request gitlab-org/gitlab-ce!17399
| | * | | | | Move TimeTrackingCollapsedState vue componentGeorge Tsiolis2018-03-213-98/+104
| | | | | | |
| * | | | | | Merge branch 'ide-folder-button-path' into 'master'Tim Zallmann2018-03-214-45/+75
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the web IDE link in tree list opening the wrong URL Closes #44477 See merge request gitlab-org/gitlab-ce!17900
| | * | | | | Fixes the web IDE link in tree list opening the wrong URLPhil Hughes2018-03-214-45/+75
| | |/ / / / | | | | | | | | | | | | | | | | | | Closes #44477
* | | | | | Prevent column with smaller width in performance barFilipa Lacerda2018-03-211-2/+1
| | | | | |
* | | | | | Merge branch 'master' into 44453-performance-bar-modalboxFilipa Lacerda2018-03-2174-240/+4515
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Changes empty project avatar to identicon in the IDE Apply NestingDepth (level 5) (framework/dropdowns.scss) Strip any query string parameters from Location headers from lograge Added monitoring docs Resolve "Loss of input text on comments after preview" fixed ide_edit_button not existing Update spec import path for vue mount component helper remove JS for cookie toggle move confirm_danger_modal bindings directly into the only two pages that need it remove un-used IDE helper module fixed SCSS lint updated file references in specs Move IDE to CE Fix test failures with licensee 8.9 refactor ConfirmDangerModal into ES module Update licensee 8.7.0 -> 8.9 Update gettext_i18n_rails_js 1.2.0 -> 1.3
| * | | | | Merge branch '39584-nesting-depth-5-framework-dropdowns' into 'master'Clement Ho2018-03-211-4/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | NestingDepth (level 5) in framework/dropdowns.scss See merge request gitlab-org/gitlab-ce!17820
| | * | | | | Apply NestingDepth (level 5) (framework/dropdowns.scss)Takuya Noguchi2018-03-211-4/+2
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'ide-project-avatar-identicon' into 'master'Filipa Lacerda2018-03-211-7/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes empty project avatar to identicon in the IDE Closes #44298 See merge request gitlab-org/gitlab-ce!17899
| | * | | | | Changes empty project avatar to identicon in the IDEPhil Hughes2018-03-211-7/+18
| | | |/ / / | | |/| | | | | | | | | | | | | | | Closes #44298
| * | | | | Merge branch 'fix-confirm-danger-modal' into 'master'Filipa Lacerda2018-03-214-41/+32
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Refactor ConfirmDangerModal into ES module See merge request gitlab-org/gitlab-ce!17874
| | * | | | move confirm_danger_modal bindings directly into the only two pages that need itfix-confirm-danger-modalMike Greiling2018-03-204-10/+15
| | | | | |
| | * | | | refactor ConfirmDangerModal into ES moduleMike Greiling2018-03-202-37/+23
| | | | | |
| * | | | | Merge branch 'make-ide-ce' into 'master'Tim Zallmann2018-03-2167-117/+4411
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move IDE to CE Closes #44157 See merge request gitlab-org/gitlab-ce!17887
| | * | | | remove JS for cookie togglePhil Hughes2018-03-201-22/+19
| | | | | |
View Lorry Controller Status