summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* fix spec for loading note from url hash35475-lazy-diffSimon Knox2018-03-061-2/+8
|
* limit listeners only to notes.jsSimon Knox2018-03-062-60/+62
|
* better display of placeholder and error messageSimon Knox2018-03-062-3/+7
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 35475-lazy-diffSimon Knox2018-03-06942-8939/+10155
|\
| * Resolve "SSH key add text"Brendan O'Leary 🐢2018-03-051-1/+3
| |
| * Merge branch 'dz-use-less-deprecated-methods' into 'master'Douwe Maan2018-03-0546-64/+64
| |\ | | | | | | | | | | | | Reduce usage of deprecated *_with_namespace methods See merge request gitlab-org/gitlab-ce!17523
| | * Replace deprecated name_with_namespace with full_name in app and specDmitriy Zaporozhets2018-03-0515-20/+20
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Replace deprecated name_with_namespace with full_name in app/viewsDmitriy Zaporozhets2018-03-0528-35/+35
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Replace deprecated path_with_namespace with full_pathDmitriy Zaporozhets2018-03-053-9/+9
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Projects and groups badges APIFrancisco Javier López2018-03-0511-0/+169
| | |
| * | Merge branch 'jprovazn-count-cleanup' into 'master'43739-gl_repository-not-set-when-merging-merge-requests-from-the-web-uiRobert Speicher2018-03-051-4/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Cleanup after adding MR diff's commit_count Closes #41698 See merge request gitlab-org/gitlab-ce!17513
| | * | Cleanup after adding MR diff's commit_countJan Provaznik2018-03-051-4/+0
| | |/ | | | | | | | | | | | | | | | * processes any pending records which are not migrated yet * bumps import_export version because of new commits_count attribute * removes commits_count fallback method
| * | Merge branch 'fix-impersonate-ui' into 'master'Rémy Coutable2018-03-051-1/+0
| |\ \ | | | | | | | | | | | | | | | | Remove impersonate token from flash scope in UI See merge request gitlab-org/gitlab-ce!17480
| | * | Remove impersonate token from flash scopejulien MILLAU2018-03-021-1/+0
| | | |
| * | | Merge branch 'fix/find-commit-with-empty-rev' into 'master'Robert Speicher2018-03-051-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep note commit around if commit_id is present Closes gitaly#1054 See merge request gitlab-org/gitlab-ce!17496
| | * | | Keep a commit around if its sha is presentAhmad Sherif2018-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | Closes gitaly#1054
| * | | | Merge branch 'kp-label-select-vue' into 'master'Phil Hughes2018-03-0513-4/+559
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Port Labels Select dropdown to Vue See merge request gitlab-org/gitlab-ce!17411
| | * | | | LabelsSelect DropdownValueCollapsed ComponentKushal Pandya2018-03-051-0/+48
| | | | | |
| | * | | | LabelsSelect DropdownValue ComponentKushal Pandya2018-03-051-0/+63
| | | | | |
| | * | | | LabelsSelect DropdownTitle ComponentKushal Pandya2018-03-051-0/+30
| | | | | |
| | * | | | LabelsSelect DropdownSearchInput ComponentKushal Pandya2018-03-051-0/+27
| | | | | |
| | * | | | LabelsSelect DropdownHiddenInput ComponentKushal Pandya2018-03-051-0/+22
| | | | | |
| | * | | | LabelsSelect DropdownHeader ComponentKushal Pandya2018-03-051-0/+21
| | | | | |
| | * | | | LabelsSelect DropdownFooter ComponentKushal Pandya2018-03-051-0/+34
| | | | | |
| | * | | | LabelsSelect DropdownCreateLabel ComponentKushal Pandya2018-03-051-0/+84
| | | | | |
| | * | | | LabelsSelect DropdownButton ComponentKushal Pandya2018-03-051-0/+78
| | | | | |
| | * | | | LabelsSelect Base ComponentKushal Pandya2018-03-051-0/+149
| | | | | |
| | * | | | Update path for ListLabel modelKushal Pandya2018-03-051-1/+1
| | | | | |
| | * | | | ListLabel Shared ModelKushal Pandya2018-03-051-3/+1
| | | | | |
| | * | | | Allow exposing methods to `gon_helper`Kushal Pandya2018-03-051-0/+1
| | | |_|/ | | |/| |
| * | | | Merge branch ↵Robert Speicher2018-03-051-4/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43809-not-seeing-mentioned-in-commit-system-message-after-merging' into 'master' Resolve "Not seeing "mentioned in commit" system message after merging" Closes #43809 See merge request gitlab-org/gitlab-ce!17524
| | * | | | Fix MR merge commit cross-references to the MR itselfSean McGivern2018-03-051-4/+3
| | | | | |
| * | | | | Merge branch 'wip-slash-command-on-mr-description' into 'master'Rémy Coutable2018-03-055-15/+25
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New `/wip` quick action on MR creation Closes #26848 See merge request gitlab-org/gitlab-ce!17463
| | * | | | | Rename quick actions handlerOswaldo Ferreira2018-03-052-3/+3
| | | | | | |
| | * | | | | Move wip handling to MergeRequest::BaseServicewip-slash-command-on-mr-descriptionOswaldo Ferreira2018-03-015-355/+25
| | | | | | |
| | * | | | | /wip slash command on MR creationAdam Pahlevi2018-03-013-11/+351
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change to symbol add complete changelog add test for /wip unwip as sym test for work in progress separate from issuable
| * | | | | | Merge branch ↵Rémy Coutable2018-03-051-4/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37430-projects-comparecontroller-show-is-calling-gitaly-n-1-times-per-request' into 'master' Resolve "Projects::CompareController#show is calling Gitaly n+1 times per request" Closes #37430 See merge request gitlab-org/gitlab-ce!17439
| | * | | | | | Fix n+1 issue by not reloading fully loaded blobsAlejandro Rodríguez2018-03-051-4/+2
| | | | | | | |
| * | | | | | | Merge branch '43837-error-handle-in-updating-milestone-on-issue' into 'master'Jacob Schatz2018-03-051-0/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loading spinner not stop even on errors in updating Milestone on Issue Closes #43837 See merge request gitlab-org/gitlab-ce!17507
| | * | | | | | | Stop loading spinner on error of milestone update on issueTakuya Noguchi2018-03-041-0/+3
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch '41616-api-issues-between-date' into 'master'Sean McGivern2018-03-055-0/+33
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "API support for selecting only updated issues before/after a given date" Closes #41616 See merge request gitlab-org/gitlab-ce!17417
| | * | | | | | Adds updated_at filter to issues and merge_requests APIJacopo2018-03-055-0/+33
| | | | | | | |
| * | | | | | | Use limited count queries also for scoped searchesJan Provaznik2018-03-052-4/+16
| | | | | | | |
| * | | | | | | Merge branch '43334-reply-by-email-did-not-pick-up-unsubscribe-quick-action' ↵Rémy Coutable2018-03-052-6/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Reply-by-email did not pick up /unsubscribe quick action" Closes #43334 See merge request gitlab-org/gitlab-ce!17482
| | * | | | | | | Fix quick actions for users who cannot update issues and MRs43334-reply-by-email-did-not-pick-up-unsubscribe-quick-actionSean McGivern2018-03-022-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are several quick actions now that don't need this access - /todo and /unsubscribe for instance - but when these were first added, there weren't. Quick actions are now responsible for checking their own permissions.
| * | | | | | | | Merge branch 'ee-4862-verify-file-checksums' into 'master'Sean McGivern2018-03-051-0/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Foreground verification of uploads and LFS objects See merge request gitlab-org/gitlab-ce!17402
| | * | | | | | | | Foreground verification of uploads and LFS objectsee-4862-verify-file-checksumsNick Thomas2018-03-021-0/+4
| | |/ / / / / / /
| * | | | | | | | Merge branch 'remove-projects-finder-from-todos-finder' into 'master'Sean McGivern2018-03-051-9/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use ProjectsFinder in TodosFinder Closes #43767 See merge request gitlab-org/gitlab-ce!17462
| | * | | | | | | | Don't use ProjectsFinder in TodosFinderremove-projects-finder-from-todos-finderYorick Peterse2018-03-021-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using ProjectsFinder in TodosFinder to limit todos to the right projects leads to overly complicated and slow database queries. This commit removes the use of ProjectsFinder in favour of using Project.public_or_visible_to_current_user directly. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/43767
| * | | | | | | | | Merge branch 'remove-ide' into 'master'Tim Zallmann2018-03-0559-3662/+0
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove IDE from CE See merge request gitlab-org/gitlab-ce!17458
View Lorry Controller Status