summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '44149-issue-comment-buttons' into 'master'Phil Hughes2018-03-135-7/+34
| | | | | | | | Resolve "Wrong button has the loading state when submitting a comment in issues" Closes #44149 See merge request gitlab-org/gitlab-ce!17698
* 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
* Merge branch 'fix-duplicate-notes' into 'master'Filipa Lacerda2018-03-133-13/+14
| | | | | | | Fixed issue notes being duplicated Closes #44099 See merge request gitlab-org/gitlab-ce!17671
* Merge branch '42814-fix-remove-source-branch-when-mwps' into 'master'Phil Hughes2018-03-131-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
* 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
| | | |
* | | | Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan2018-03-075-3/+28
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 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-075-3/+28
| |/ / | | | | | | | | | | | | | | | 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 '39444-make-margin-around-dropdown-dividers-4px' into 'master'Clement Ho2018-03-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Make margin around dropdown dividers 4px" Closes #39444 See merge request gitlab-org/gitlab-ce!17517
| * | | Set margins around dropdown dividers to 4px (based on grid)39444-make-margin-around-dropdown-dividers-4pxLukas Eipert2018-03-051-1/+1
| | | |
* | | | 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-078-89/+411
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 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-016-149/+159
| | | | |
| * | | | Added vue based promotion modals for labels and milestonesJose Ivan Vargas2018-03-018-87/+399
| | | | |
* | | | | 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-069-61/+170
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | |
| * | | | | lighten axis tick textMike Greiling2018-03-061-1/+2
| | | | | |
| * | | | | 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-06216-4983/+3142
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Changes after review38587-pipelines-empty-stateFilipa Lacerda2018-03-055-14/+8
| | | | | |
| | * | | | [ci skip] Merge branch 'master' into 38587-pipelines-empty-stateFilipa Lacerda2018-03-0513-4/+561
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (52 commits) Projects and groups badges API Keep a commit around if its sha is present #43691: DiffNotes not counted by ContributionsCalendar Cleanup after adding MR diff's commit_count Fix MR merge commit cross-references to the MR itself Fix n+1 issue by not reloading fully loaded blobs Add "added" type on changelog Use limited count queries also for scoped searches Update changelog Rename quick actions handler Adds updated_at filter to issues and merge_requests API Update API: add search param to branches Add changelog entry LabelsSelect DropdownValueCollapsed Component LabelsSelect DropdownValue Component LabelsSelect DropdownTitle Component LabelsSelect DropdownSearchInput Component LabelsSelect DropdownHiddenInput Component LabelsSelect DropdownHeader Component LabelsSelect DropdownFooter Component ...
| | * | | | | Fix broken empty tab stateFilipa Lacerda2018-03-051-1/+1
| | | | | | |
View Lorry Controller Status