summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rd-fix-github-url-when-listing-repositories-at-importing' into ↵Douwe Maan2018-03-121-5/+8
|\ | | | | | | | | | | | | 'master' Fix provider server URL used when listing repos to import See merge request gitlab-org/gitlab-ce!17692
| * Fix provider server URL used when listing repos to importrd-fix-github-url-when-listing-repositories-at-importingRubén Dávila2018-03-121-5/+8
| | | | | | | | Also use Gitlab::Auth::OAuth::Provider.config_for to access OmniAuth config
* | Fix inconsistent punctuation on MR formBob Van Landuyt2018-03-121-1/+1
| |
* | 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-124-14/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-093-4/+4
| | | | | | | | | | | | | | | | | | | | Closes #44099
* | | | | Resolve "Hover style for sidebar dropdowns is wrong"Lukas Eipert2018-03-121-13/+27
| | | | |
* | | | | Merge branch 'osw-stop-recalculating-merge-base-on-mr-loading' into 'master'Sean McGivern2018-03-122-22/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Avoid re-fetching merge-base SHA from Gitaly unnecessarily See merge request gitlab-org/gitlab-ce!17630
| * | | | | Remove unused Compare#base_commitosw-stop-recalculating-merge-base-on-mr-loadingOswaldo Ferreira2018-03-081-10/+5
| | | | | |
| * | | | | Avoid re-fetching merge-base SHA from Gitaly unnecessarilyOswaldo Ferreira2018-03-072-18/+27
| | | | | |
* | | | | | Merge branch '44139-fix-issue-boards-dup-keys' into 'master'Phil Hughes2018-03-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use object ID to prevent duplicate keys Vue warning on Issue Boards page during development Closes #44139 See merge request gitlab-org/gitlab-ce!17682
| * | | | | | Use `list.id` for `:key`Kushal Pandya2018-03-121-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | 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
* | | | | 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-126-7/+87
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | |
| * | | | | | Use label dropdown helper for rendering contextual stringKushal Pandya2018-03-122-4/+6
| | | | | | |
| * | | | | | Add helpers for labels dropdownKushal Pandya2018-03-121-0/+33
| | |_|/ / / | |/| | | |
* | | | | | 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
| | | | |
* | | | | Merge branch 'refactor/move-assignee-title-vue-component' into 'master'Clement Ho2018-03-094-61/+66
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Move AssigneeTitle vue component See merge request gitlab-org/gitlab-ce!17397
| * | | | Move AssigneeTitle vue componentGeorge Tsiolis2018-03-094-61/+66
| | | | |
* | | | | Merge branch 'ce-5194-fix-github-ci-cd-github-auth-missing-query-param' into ↵Douwe Maan2018-03-091-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 'master' Add `?ci_cd_only=true` query parameter to CI/CD GitHub status link -- CE backport See merge request gitlab-org/gitlab-ce!17661
| * | | | Backport fix new GitHub CI/CD page redirecting to import GitHub status pagece-5194-fix-github-ci-cd-github-auth-missing-query-paramEric Eastwood2018-03-081-1/+1
| | |/ / | |/| | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4914
* | | | 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 'cache-refactor' into 'master'Sean McGivern2018-03-092-81/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Cache `#can_be_resolved_in_ui?` git operations Closes gitaly#1051 See merge request gitlab-org/gitlab-ce!17589
| * | | Cache `#can_be_resolved_in_ui?` git operationscache-refactorAlejandro Rodríguez2018-03-081-9/+1
| | | |
| * | | Refactor RepositoryCache to make it usable in other classesAlejandro Rodríguez2018-03-061-72/+2
| | | |
* | | | 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 'jivl-fix-delete-milestone-button-showing-up' into 'master'Phil Hughes2018-03-081-10/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix delete milestone button showing up for all users Closes #43778 See merge request gitlab-org/gitlab-ce!17576
| * | | | | | Fix milestone delete button showing for all usersjivl-fix-delete-milestone-button-showing-upJose Ivan Vargas2018-03-061-10/+10
| | | | | | |
* | | | | | | Fix Error 500 when updating a projectsh-fix-update-serviceStan Hu2018-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If no parameters were specified for project features but Wikis were disabled, we would get "NoMethodError: undefined method `[]' for nil:NilClass". Closes #44019
* | | | | | | Merge branch '40525-listing-user-activity-timeouts' into 'master'Yorick Peterse2018-03-082-8/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve database response time for listing user activity Closes #40525 See merge request gitlab-org/gitlab-ce!17454
View Lorry Controller Status