summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '43805-list-gitaly-calls-and-arguments-in-the-performance-bar' ↵Grzegorz Bizon2018-03-131-7/+0
|\ | | | | | | | | | | | | | | | | into 'master' Resolve "List Gitaly calls and arguments in the performance bar" Closes #43805 See merge request gitlab-org/gitlab-ce!17564
| * Improve the frontend code for the performance barSean McGivern2018-03-131-14/+0
| |
| * Add Gitaly call details to the performance barSean McGivern2018-03-131-0/+7
| | | | | | | | | | The same as the SQL queries, show the details of Gitaly calls in the performance bar, as a modal that can be opened in the same way.
* | Merge branch '44152l-last-pipeline-link' into 'master'Phil Hughes2018-03-131-4/+2
|\ \ | |/ |/| | | | | | | | | Make commit pipeline accessible on file page Closes #44152 See merge request gitlab-org/gitlab-ce!17716
| * Make commit pipeline accessible on file pageFilipa Lacerda2018-03-131-4/+2
| |
* | Resolve "Projects::MergeRequestsController#show is slow (implement skeleton ↵Simon Knox2018-03-131-0/+68
| | | | | | | | loading)"
* | Use mapState instead of a getterFilipa Lacerda2018-03-132-2/+3
| |
* | Merge branch 'master' into 44149-issue-comment-buttonsFilipa Lacerda2018-03-1311-73/+97
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (29 commits) Fix provider server URL used when listing repos to import Fix inconsistent punctuation on MR form Update dependency for svgs Fix timestamp to include %M instead of %I for post-deploy migrations. Use Gitaly 0.89.0 Resolve "Hover style for sidebar dropdowns is wrong" fixed spec Respect the protocol in `expose_url` Fix removes source branch text being rendered in merged state Fix code and wiki search results when filename is non-ASCII Include the ee/ directory in backtraces Use GitLab fork of zaproxy Updates file extensions on Vue docs fixed note polling not sending updated last fetched at date added spec for polling Add changelog entry Use `list.id` for `:key` added mutation spec Bump parser and unparser gems to remove warnings fix polling not working correctly Fixed issue notes being duplicated ...
| * Merge branch 'refactor/move-mr-widget-nothing-to-merge-vue-component' into ↵Clement Ho2018-03-123-45/+48
| |\ | | | | | | | | | | | | | | | | | | 'master' Move NothingToMerge vue component See merge request gitlab-org/gitlab-ce!17544
| | * Move NothingToMerge vue componentGeorge Tsiolis2018-03-083-45/+48
| | |
| * | Merge branch 'removes-source-branch-widget-state' into 'master'Filipa Lacerda2018-03-123-1/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix removes source branch text being rendered in merged state Closes #44163 See merge request gitlab-org/gitlab-ce!17687
| | * | Fix removes source branch text being rendered in merged stateremoves-source-branch-widget-statePhil Hughes2018-03-123-1/+7
| | | |
| * | | Merge branch 'fix-duplicate-notes' into 'master'Filipa Lacerda2018-03-123-13/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue notes being duplicated Closes #44099 See merge request gitlab-org/gitlab-ce!17671
| | * | | fixed note polling not sending updated last fetched at datefix-duplicate-notesPhil Hughes2018-03-122-6/+5
| | | | | | | | | | | | | | | | | | | | added spec for polling
| | * | | added mutation specPhil Hughes2018-03-101-6/+8
| | | | |
| | * | | fix polling not working correctlyPhil Hughes2018-03-091-1/+1
| | | | |
| | * | | Fixed issue notes being duplicatedPhil Hughes2018-03-092-3/+3
| | | | | | | | | | | | | | | | | | | | Closes #44099
| * | | | Resolve "Hover style for sidebar dropdowns is wrong"Lukas Eipert2018-03-121-13/+27
| | | | |
| * | | | Merge branch '42814-fix-remove-source-branch-when-mwps' into 'master'Phil Hughes2018-03-121-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Fix "Remove source branch" button in MR widget during MWPS state Closes #42814 and #4281 See merge request gitlab-org/gitlab-ce!17192
| | * | | Fix "Remove source branch" button in MR widget during MWPS state42814-fix-remove-source-branch-when-mwpsEric Eastwood2018-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/4281
* | | | | Fix loading icon being visible in the wrong button44149-issue-comment-buttonsFilipa Lacerda2018-03-126-6/+31
|/ / / /
* | | | Merge branch 'remove-jquery-globals' into 'master'Phil Hughes2018-03-12224-13/+311
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Require jQuery to be explicitly imported See merge request gitlab-org/gitlab-ce!17674
| * | | | require jQuery to be explicitly importedremove-jquery-globalsMike Greiling2018-03-09224-13/+311
| | | | |
* | | | | Merge branch '43702-update-label-dropdown-wording' into 'master'Phil Hughes2018-03-123-3/+48
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update wording to specify create/manage project vs group labels in labels dropdown Closes #43702 See merge request gitlab-org/gitlab-ce!17640
| * | | | | Add `createLabelTitle` & `manageLabelsTitle` props for action stringKushal Pandya2018-03-121-2/+14
| | | | | |
| * | | | | Add `headerTitle` prop for container header stringKushal Pandya2018-03-121-1/+10
| | | | | |
| * | | | | Add `isProject` and computed props to for contextual info for dropdownKushal Pandya2018-03-121-0/+24
| | | | | |
* | | | | | Merge branch 'fl-remove-duplicated-code' into 'master'Phil Hughes2018-03-121-14/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Removes duplicated & non used code See merge request gitlab-org/gitlab-ce!17667
| * | | | | Removes duplicated & non used codefl-remove-duplicated-codeFilipa Lacerda2018-03-091-14/+0
| | |_|/ / | |/| | |
* | | | | Remove sync script for gitlab-svgs and reference the vendored library directlyMike Greiling2018-03-0971-71/+0
| | | | |
* | | | | Move AssigneeTitle vue componentGeorge Tsiolis2018-03-094-61/+66
| |/ / / |/| | |
* | | | 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 'fl-svg' into 'master'Clement Ho2018-03-0817-3/+17
|\ \ \ | | | | | | | | | | | | | | | | Update svgs content See merge request gitlab-org/gitlab-ce!17650
| * | | Update svgs contentfl-svgFilipa Lacerda2018-03-0817-3/+17
| | |/ | |/|
* | | 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-0716-94/+428
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-082-3/+3
| | | | |
* | | | | Merge branch 'jivl-backport-custom-metrics-frontend' into 'master'Filipa Lacerda2018-03-074-21/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-074-21/+51
| | |_|_|/ | |/| | |
* | | | | 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-0715-95/+448
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | # 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
| | |_|_|/ / | |/| | | |