summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Collapse)AuthorAgeFilesLines
* require jQuery to be explicitly importedremove-jquery-globalsMike Greiling2018-03-09224-13/+311
|
* Merge branch 'merge-request-widget-source-branch-improvements' into 'master'Filipa Lacerda2018-03-094-3/+47
|\ | | | | | | | | | | | | Dont show remove source branch checkbox when user cannot remove the branch Closes #33264 See merge request gitlab-org/gitlab-ce!17642
| * Dont show remove source branch checkbox when user cannot remove the branchPhil Hughes2018-03-084-3/+47
| | | | | | | | Closes #33264
* | Merge branch '37211-diff-comments-fix-ctrl-enter-tooltip' into 'master'Fatih Acet2018-03-081-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Resolve ""You can also press Ctrl-Enter" tooltip lingers after Tab+Enter" Closes #37211 See merge request gitlab-org/gitlab-ce!17560
| * | Hide hotkey tooltip after click event in diff comments37211-diff-comments-fix-ctrl-enter-tooltipDennis Tang2018-03-061-1/+1
| | |
* | | Merge branch 'refactor/move-mr-widget-memory-usage-and-graph-components' ↵Phil Hughes2018-03-083-55/+78
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Move MemoryGraph and MemoryUsage vue components See merge request gitlab-org/gitlab-ce!17533
| * | | Move MemoryGraph and MemoryUsage vue componentsGeorge Tsiolis2018-03-083-55/+78
| | | |
* | | | Merge branch ↵Kamil Trzciński2018-03-083-10/+44
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '43770-change-clear-runners-cache-ujs-action-to-an-axios-request' into 'master' Resolve "Change Clear Runners cache UJS action to an API request" Closes #43770 See merge request gitlab-org/gitlab-ce!17466
| * | | [ci skip] Merge branch 'master' into ↵Filipa Lacerda2018-03-0714-90/+421
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 43770-change-clear-runners-cache-ujs-action-to-an-axios-request * master: (68 commits) Upgrade Workhorse to 4.0.0 naming things Update GitLab Pages to v0.7.0 Minor fixes in API doc Use Project#full_name instead of name_with_namespace Fix tests not completely disabling Gitaly Move OperationService#UserRemoveBranch Move OperationService#UserCreateBranch Move CommitService#Languages to OPT_OUT Move RefService#CreateBranch to OPT_OUT Move RefService#DeleteBranch to OPT_OUT Move OperationService#UserRevert to OPT_OUT Move OperationService#UserAddTag to OPT_OUT Move CommitService::CommitPatch to OPT_OUT Change to Pacific Time Zone Merge branch 'pages-6-1-gitlab-10-5' into 'security-10-5' Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5' Remove wrong assumption about Runners cache GC Add CommonMark markdown engine add nginx_status monitoring details ...
| * | | | Removes UJS from reset cache buttonFilipa Lacerda2018-03-073-10/+44
| | | | | | | | | | | | | | | | | | | | Uses loading button for better UX
* | | | | Address frontend feedbackBob Van Landuyt2018-03-081-1/+2
| | | | |
* | | | | Merge branch 'jivl-backport-custom-metrics-frontend' into 'master'Filipa Lacerda2018-03-071-20/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | backport of custom metrics for the common metrics section of CE See merge request gitlab-org/gitlab-ce!17586
| * | | | | backport of custom metrics for the common metrics section of CEjivl-backport-custom-metrics-frontendJose Ivan Vargas2018-03-071-20/+39
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ce-3839-ci-cd-only-github-projects-fe' into 'master'Douwe Maan2018-03-071-7/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Create CI/CD-only projects from GitHub -- CE backport See merge request gitlab-org/gitlab-ce!17432
| * \ \ \ \ Merge branch 'master' into 'ce-3839-ci-cd-only-github-projects-fe'ce-3839-ci-cd-only-github-projects-feDouwe Maan2018-03-0712-90/+439
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # locale/gitlab.pot
| * | | | | | CE backport for creating CI/CD projects from GitHubRubén Dávila2018-03-071-7/+24
| | | | | | |
* | | | | | | Merge branch 'refactor/move-sidebar-assignee-vue-component' into 'master'Clement Ho2018-03-072-44/+47
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Move SidebarAssignees vue component See merge request gitlab-org/gitlab-ce!17398
| * | | | | | Move SidebarAssignees vue componentGeorge Tsiolis2018-03-072-44/+47
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan2018-03-074-2/+26
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow maintainers to push forks of a project for branches that have open MRs Closes #22292 See merge request gitlab-org/gitlab-ce!17395
| * | | | | Allow a user to select `allow maintainer to push`Bob Van Landuyt2018-03-074-2/+26
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | When a project is not private, and the source branch not protected the user can now select the option to allow maintainers to push to this branch
* | | | | Merge branch '4326-fix-js-or-true' into 'master'Clement Ho2018-03-071-2/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix a JS bug in the websocket terminal See merge request gitlab-org/gitlab-ce!17470
| * | | | | Fix a JS bug in the websocket terminalNick Thomas2018-03-071-2/+8
| | |_|/ / | |/| | |
* | | | | Merge branch 'jivl-new-modal-project-labels-milestones' into 'master'Filipa Lacerda2018-03-077-86/+405
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Resolve: Modal and banner designs for project label and project milestone promotion Closes #41895 See merge request gitlab-org/gitlab-ce!17197
| * | | | used respond_to formats for persisting flash messages insteadjivl-new-modal-project-labels-milestonesJose Ivan Vargas2018-03-064-64/+8
| | | | |
| * | | | Add persistent flash messagesJose Ivan Vargas2018-03-014-2/+58
| | | | |
| * | | | Changed selector names, address code concernsJose Ivan Vargas2018-03-015-147/+155
| | | | |
| * | | | Added vue based promotion modals for labels and milestonesJose Ivan Vargas2018-03-017-86/+397
| | | | |
* | | | | Merge branch '43502-clipboard-btn' into 'master'Phil Hughes2018-03-076-2/+8
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update clipboard button component not to render default css classes" Closes #43502 See merge request gitlab-org/gitlab-ce!17529
| * | | | Removes btn-transparent and btn-clipboard as default classes for clipboard ↵43502-clipboard-btnFilipa Lacerda2018-03-066-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | button component Changes after review
* | | | | Remove common_vue bundleMike Greiling2018-03-061-0/+1
|/ / / /
* | | | Merge branch 'ce-3727-fe-labels-for-epics' into 'master'Filipa Lacerda2018-03-062-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE Port: Add `js-` classes in LabelsSelect component See merge request gitlab-org/gitlab-ce!17558
| * | | | Add `js-*` class to refer in JSKushal Pandya2018-03-062-3/+3
| | | | |
* | | | | Merge branch 'cluster-monitoring-changes-ce-backport' into 'master'Phil Hughes2018-03-068-60/+168
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Cluster monitoring changes CE backport See merge request gitlab-org/gitlab-ce!17547
| * | | | | move misplaced entry pointcluster-monitoring-changes-ce-backportMike Greiling2018-03-061-0/+0
| | | | | |
| * | | | | coerce hasMetrics to a boolean value before instantiating the Vue componentMike Greiling2018-03-062-5/+9
| | | | | |
| * | | | | prefer getElementByIdMike Greiling2018-03-061-1/+1
| | | | | |
| * | | | | remove prometheus panel styling on cluster monitoring pageMike Greiling2018-03-062-1/+21
| | | | | |
| * | | | | add ability to override graph size measurementsMike Greiling2018-03-062-1/+12
| | | | | |
| * | | | | fix spacing around axis label text in small breakpointsMike Greiling2018-03-061-2/+3
| | | | | |
| * | | | | hide legend without hiding the axis labelsMike Greiling2018-03-062-35/+42
| | | | | |
| * | | | | add option to hide the graph legendMike Greiling2018-03-062-1/+15
| | | | | |
| * | | | | use proper dependency injection for monitoring dashboard componentMike Greiling2018-03-062-21/+66
| | | | | |
| * | | | | make deployments endpoint optionalMike Greiling2018-03-061-0/+3
| | | | | |
| * | | | | add prometheus cluster health monitoring empty stateMike Greiling2018-03-061-1/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'issue_38337' into 'master'Sean McGivern2018-03-0613-54/+268
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring one group board to CE Closes #38337 See merge request gitlab-org/gitlab-ce!17274
| * \ \ \ \ Merge branch 'master' into 'issue_38337'Felipe Artur2018-03-0684-3845/+915
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | # Conflicts: # app/models/group.rb # db/schema.rb
| * | | | | Bring one group board to CEFelipe Artur2018-03-0313-54/+268
| | | | | |
* | | | | | Merge remote-tracking branch 'upstream/master' into ↵5029-support-cluster-metrics-cePawel Chojnacki2018-03-06212-4973/+3123
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 5029-support-cluster-metrics-ce # Conflicts: # spec/models/clusters/applications/prometheus_spec.rb
| * | | | | Resolve "Group Leave action is broken on Groups Dashboard and Homepage"Shah El-Rahman2018-03-061-5/+5
| | | | | |
| * | | | | Merge branch '38587-pipelines-empty-state' into 'master'Phil Hughes2018-03-068-220/+300
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Pipelines view should handle empty state and buttons properly" Closes #38587 See merge request gitlab-org/gitlab-ce!17433
View Lorry Controller Status