Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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-added | Rémy Coutable | 2017-11-15 | 4 | -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-forks | Yorick Peterse | 2017-11-15 | 2 | -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-polymorphism | Douwe Maan | 2017-11-15 | 2 | -15/+11 |
| | | |||||
* | | Merge branch 'update-merge-worker-metrics' into 'master' | Sean McGivern | 2017-11-15 | 1 | -1/+17 |
|\ \ | | | | | | | | | | | | | Add simple logging to UpdateMergeRequestsWorker#perform See merge request gitlab-org/gitlab-ce!15360 | ||||
| * | | [ci-skip] lintingupdate-merge-worker-metrics | Micael Bergeron | 2017-11-14 | 1 | -1/+0 |
| | | | |||||
| * | | rework the logging to be simpler and add a threshold | micael.bergeron | 2017-11-14 | 1 | -6/+12 |
| | | | |||||
| * | | add simple logging to UpdateMergeRequestsWorker#perform | micael.bergeron | 2017-11-13 | 1 | -1/+12 |
| | | | | | | | | | | | | this is to try to debug #35914 | ||||
* | | | Merge branch 'ce-backport-39009-fix-approvals-showing-up-in-empty-mr-widget' ↵ | Phil Hughes | 2017-11-15 | 1 | -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-widget | Eric Eastwood | 2017-11-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3376 | ||||
* | | | | Resolve "Internationalization support for Prometheus Service Configuration" | Jose Ivan Vargas Lopez | 2017-11-15 | 2 | -18/+15 |
| | | | | |||||
* | | | | 40161 Remove extra margin from wordmark in header40161-extra-margin-on-svg-logo-in-header | tauriedavis | 2017-11-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'bvl-subgroup-in-dropdowns' into 'master' | Sean McGivern | 2017-11-14 | 2 | -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-dropdowns | Bob Van Landuyt | 2017-11-14 | 1 | -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 dropdowns | Bob Van Landuyt | 2017-11-14 | 2 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | These dropdown options are used for creating and transfering projects. | ||||
* | | | | | Merge branch 'fix-typo' into 'master' | Annabel Dunstone Gray | 2017-11-14 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo See merge request gitlab-org/gitlab-ce!15358 | ||||
| * | | | | | Fix typofix-typo | Clement Ho | 2017-11-13 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Stops page reload when changing tabs or pages - uses API requests instead | Filipa Lacerda | 2017-11-14 | 5 | -120/+180 |
| | | | | | | |||||
* | | | | | | Merge branch 'enable-scss-lint-unnecessary-mantissa' into 'master' | Clement Ho | 2017-11-14 | 4 | -9/+9 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | Enable UnnecessaryMantissa in scss-lint See merge request gitlab-org/gitlab-ce!15255 | ||||
| * | | | | | Enable UnnecessaryMantissa in scss-lint | Takuya Noguchi | 2017-11-09 | 4 | -9/+9 |
| | | | | | | |||||
* | | | | | | Merge branch 'issue_40058' into 'master' | Sean McGivern | 2017-11-14 | 1 | -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_40058 | Felipe Artur | 2017-11-13 | 1 | -1/+2 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'fix-filter-by-my-reaction' into 'master' | Sean McGivern | 2017-11-14 | 1 | -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 working | Hiroyuki Sato | 2017-11-13 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master' | Kamil Trzciński | 2017-11-14 | 5 | -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-new | Shinya Maeda | 2017-11-07 | 154 | -1018/+1456 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add doc. Fix spec. Add erase_build in protected_ref rule | Shinya Maeda | 2017-11-07 | 3 | -6/+10 |
| | | | | | | | | | |||||
| * | | | | | | | | Do not allow jobs to be erased | Shinya Maeda | 2017-11-06 | 5 | -2/+16 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '39884-fix-pipeline-transition-with-single-manual-action' into ↵ | Kamil Trzciński | 2017-11-14 | 1 | -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-action | Lin Jen-Shin | 2017-11-09 | 1 | -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 Zallmann | 2017-11-14 | 2 | -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-size | Filipa Lacerda | 2017-11-13 | 2 | -1/+34 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'slack_landing_page-ce-backport' into 'master' | Jacob Schatz | 2017-11-14 | 5 | -0/+55 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slack landing page ce backport See merge request gitlab-org/gitlab-ce!15354 | ||||
| * | | | | | | | | | | backport popup varsslack_landing_page-ce-backport | Luke "Jared" Bennett | 2017-11-13 | 1 | -0/+7 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | url_utility and style backport | Luke "Jared" Bennett | 2017-11-13 | 4 | -0/+48 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jej/fix-lfs-integrity-with-forks' into 'master' | Douwe Maan | 2017-11-14 | 3 | -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-forks | James Edwards-Jones | 2017-11-09 | 3 | -18/+14 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch '38869-project' into 'master' | Phil Hughes | 2017-11-14 | 5 | -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-project | Filipa Lacerda | 2017-11-13 | 5 | -164/+142 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'bvl-refresh-member-listing-on-removal' into 'master' | Tim Zallmann | 2017-11-13 | 2 | -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-removal | Bob Van Landuyt | 2017-11-13 | 2 | -13/+0 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch '3615-improve-welcome-screen' into 'master' | Tim Zallmann | 2017-11-13 | 6 | -102/+164 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorganize landing page for new users See merge request gitlab-org/gitlab-ce!15191 | ||||
| * | | | | | | | | | | | Use flexbox instead of bootstrap columns3615-improve-welcome-screen | Annabel Dunstone Gray | 2017-11-08 | 4 | -86/+97 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Add new icon; update content | Annabel Dunstone Gray | 2017-11-08 | 3 | -3/+4 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Add four blocks to each welcome page | Annabel Dunstone Gray | 2017-11-08 | 2 | -10/+28 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Update new project icon | Annabel Dunstone Gray | 2017-11-08 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Add mobile styles | Annabel Dunstone Gray | 2017-11-08 | 1 | -4/+15 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Reorganize landing page for new users | Annabel Dunstone Gray | 2017-11-08 | 4 | -94/+115 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch ↵ | Annabel Dunstone Gray | 2017-11-13 | 1 | -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-dropdown | Jose Ivan Vargas | 2017-11-10 | 1 | -1/+1 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch '40068-runner-sorting-regression' into 'master' | Annabel Dunstone Gray | 2017-11-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert a regression on runners sorting (!15134) Closes #40068 See merge request gitlab-org/gitlab-ce!15341 |