summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Add total_time_spent to the `changes` hash in issuable Webhook payloads40122-only-one-note-webhook-is-triggered-when-a-comment-with-time-spent-is-addedRémy Coutable2017-11-154-10/+20
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'dm-import-service-polymorphism' into 'master'40186-the-ee_compat_check-job-sometimes-fail-on-the-git-apply-3way-step-for-forksYorick Peterse2017-11-152-15/+11
|\ | | | | | | | | Prefer polymorphism over specific type checks in Import service See merge request gitlab-org/gitlab-ce!15397
| * Prefer polymorphism over specific type checks in Import servicedm-import-service-polymorphismDouwe Maan2017-11-152-15/+11
| |
* | Merge branch 'update-merge-worker-metrics' into 'master'Sean McGivern2017-11-151-1/+17
|\ \ | | | | | | | | | | | | Add simple logging to UpdateMergeRequestsWorker#perform See merge request gitlab-org/gitlab-ce!15360
| * | [ci-skip] lintingupdate-merge-worker-metricsMicael Bergeron2017-11-141-1/+0
| | |
| * | rework the logging to be simpler and add a thresholdmicael.bergeron2017-11-141-6/+12
| | |
| * | add simple logging to UpdateMergeRequestsWorker#performmicael.bergeron2017-11-131-1/+12
| | | | | | | | | | | | this is to try to debug #35914
* | | Merge branch 'ce-backport-39009-fix-approvals-showing-up-in-empty-mr-widget' ↵Phil Hughes2017-11-151-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Remove approvals when in empty MR widget state -- CE backport See merge request gitlab-org/gitlab-ce!15362
| * | | Backport spec changes from EE remove approvals in empty statece-backport-39009-fix-approvals-showing-up-in-empty-mr-widgetEric Eastwood2017-11-131-1/+1
| | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3376
* | | | Resolve "Internationalization support for Prometheus Service Configuration"Jose Ivan Vargas Lopez2017-11-152-18/+15
| | | |
* | | | 40161 Remove extra margin from wordmark in header40161-extra-margin-on-svg-logo-in-headertauriedavis2017-11-141-1/+1
| | | |
* | | | Merge branch 'bvl-subgroup-in-dropdowns' into 'master'Sean McGivern2017-11-142-3/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include child projects a user can manage in namespace dropdowns Closes #39987 See merge request gitlab-org/gitlab-ce!15294
| * | | | Guarantee the order of groups in the dropdownbvl-subgroup-in-dropdownsBob Van Landuyt2017-11-141-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So the groups with the same parent are listed together. The recursive cte seemed to do it by itself, but it is not guaranteed. By ordering on the `route.path` that includes every parent group, we can assume they're going to be in the right order.
| * | | | Include child projects a user can manage in namespace dropdownsBob Van Landuyt2017-11-142-2/+11
| | | | | | | | | | | | | | | | | | | | These dropdown options are used for creating and transfering projects.
* | | | | Merge branch 'fix-typo' into 'master'Annabel Dunstone Gray2017-11-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix typo See merge request gitlab-org/gitlab-ce!15358
| * | | | | Fix typofix-typoClement Ho2017-11-131-1/+1
| | | | | |
* | | | | | Stops page reload when changing tabs or pages - uses API requests insteadFilipa Lacerda2017-11-145-120/+180
| | | | | |
* | | | | | Merge branch 'enable-scss-lint-unnecessary-mantissa' into 'master'Clement Ho2017-11-144-9/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Enable UnnecessaryMantissa in scss-lint See merge request gitlab-org/gitlab-ce!15255
| * | | | | Enable UnnecessaryMantissa in scss-lintTakuya Noguchi2017-11-094-9/+9
| | | | | |
* | | | | | Merge branch 'issue_40058' into 'master'Sean McGivern2017-11-141-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent position update for image diff notes Closes #40058 See merge request gitlab-org/gitlab-ce!15357
| * | | | | | Prevents position update for image diff notesissue_40058Felipe Artur2017-11-131-1/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fix-filter-by-my-reaction' into 'master'Sean McGivern2017-11-141-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix filter by my reaction is not working Closes #39930 See merge request gitlab-org/gitlab-ce!15345
| * | | | | | Fix filter by my reaction is not workingHiroyuki Sato2017-11-131-0/+1
| | | | | | |
* | | | | | | Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master'Kamil Trzciński2017-11-145-4/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not allow jobs to be erased Closes #31771 See merge request gitlab-org/gitlab-ce!15216
| * \ \ \ \ \ \ Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-newShinya Maeda2017-11-07154-1018/+1456
| |\ \ \ \ \ \ \
| * | | | | | | | Add doc. Fix spec. Add erase_build in protected_ref ruleShinya Maeda2017-11-073-6/+10
| | | | | | | | |
| * | | | | | | | Do not allow jobs to be erasedShinya Maeda2017-11-065-2/+16
| | | | | | | | |
* | | | | | | | | Merge branch '39884-fix-pipeline-transition-with-single-manual-action' into ↵Kamil Trzciński2017-11-141-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Make sure all pipelines would go to pending once Closes #39884 See merge request gitlab-org/gitlab-ce!15251
| * | | | | | | | | Make sure all pipelines would go to pending once39884-fix-pipeline-transition-with-single-manual-actionLin Jen-Shin2017-11-091-2/+2
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this fix, pipeline could go from skipped to running directly, bypassing the transition for: [:created, :pending] => :running And this is responsible for setting up started_at. Without this fix, started_at would never be set. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/39884
* | | | | | | | | Merge branch '40092-fix-cluster-size' into 'master'Tim Zallmann2017-11-142-1/+34
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Formats bytes to human readable number in registry table See merge request gitlab-org/gitlab-ce!15359
| * | | | | | | | | Formats bytes to human reabale number in registry table40092-fix-cluster-sizeFilipa Lacerda2017-11-132-1/+34
| | | | | | | | | |
* | | | | | | | | | Merge branch 'slack_landing_page-ce-backport' into 'master'Jacob Schatz2017-11-145-0/+55
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slack landing page ce backport See merge request gitlab-org/gitlab-ce!15354
| * | | | | | | | | | backport popup varsslack_landing_page-ce-backportLuke "Jared" Bennett2017-11-131-0/+7
| | | | | | | | | | |
| * | | | | | | | | | url_utility and style backportLuke "Jared" Bennett2017-11-134-0/+48
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'jej/fix-lfs-integrity-with-forks' into 'master'Douwe Maan2017-11-143-18/+14
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle forks in Gitlab::Checks::LfsIntegrity Closes #39902 See merge request gitlab-org/gitlab-ce!15279
| * | | | | | | | | | | Handle forks in Gitlab::Checks::LfsIntegrityjej/fix-lfs-integrity-with-forksJames Edwards-Jones2017-11-093-18/+14
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '38869-project' into 'master'Phil Hughes2017-11-145-164/+142
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export project, projectAvatar and projectImport as ES6 modules See merge request gitlab-org/gitlab-ce!15355
| * | | | | | | | | | | | Export project, projectAvatar and projectImport as ES6 modules38869-projectFilipa Lacerda2017-11-135-164/+142
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'bvl-refresh-member-listing-on-removal' into 'master'Tim Zallmann2017-11-132-13/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't perform a JS request when deleting a membership. Closes #39933 and #31720 See merge request gitlab-org/gitlab-ce!15344
| * | | | | | | | | | | Don't perform a JS request when deleting a membership.bvl-refresh-member-listing-on-removalBob Van Landuyt2017-11-132-13/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '3615-improve-welcome-screen' into 'master'Tim Zallmann2017-11-136-102/+164
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorganize landing page for new users See merge request gitlab-org/gitlab-ce!15191
| * | | | | | | | | | | Use flexbox instead of bootstrap columns3615-improve-welcome-screenAnnabel Dunstone Gray2017-11-084-86/+97
| | | | | | | | | | | |
| * | | | | | | | | | | Add new icon; update contentAnnabel Dunstone Gray2017-11-083-3/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Add four blocks to each welcome pageAnnabel Dunstone Gray2017-11-082-10/+28
| | | | | | | | | | | |
| * | | | | | | | | | | Update new project iconAnnabel Dunstone Gray2017-11-081-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Add mobile stylesAnnabel Dunstone Gray2017-11-081-4/+15
| | | | | | | | | | | |
| * | | | | | | | | | | Reorganize landing page for new usersAnnabel Dunstone Gray2017-11-084-94/+115
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch ↵Annabel Dunstone Gray2017-11-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37174-wrong-case-for-roles-header-in-allowed-to-create-project-settings-dropdown' into 'master' Resolve "Wrong case for 'Roles' header in 'Allowed to create' project settings dropdown" Closes #37174 See merge request gitlab-org/gitlab-ce!15326
| * | | | | | | | | | Add missing CSS class to capitalize the protectec tag header dropdown37174-wrong-case-for-roles-header-in-allowed-to-create-project-settings-dropdownJose Ivan Vargas2017-11-101-1/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '40068-runner-sorting-regression' into 'master'Annabel Dunstone Gray2017-11-131-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert a regression on runners sorting (!15134) Closes #40068 See merge request gitlab-org/gitlab-ce!15341