summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* create a cacheable commons bundle for d3 libraryMike Greiling2017-03-037-6/+13
|
* merge lib_chart into graphs bundleMike Greiling2017-03-036-7/+2
|
* include vue_shared scripts within common_vue chunkMike Greiling2017-03-031-1/+3
|
* create a cacheable commons bundle for our Vue bundlesMike Greiling2017-03-0312-5/+28
|
* don't rely on global spaced Vue library for issuable bundleMike Greiling2017-03-031-0/+2
|
* separate webpack runtime into its own chunk to maintain cacheability of ↵Mike Greiling2017-03-032-3/+3
| | | | common chunk
* refactor common bundle to ES module syntax and move global exports to ↵Mike Greiling2017-03-035-32/+49
| | | | application.js
* create a common.js bundle and include all jQuery pluginsMike Greiling2017-03-037-30/+34
|
* update plugin formattingMike Greiling2017-03-031-0/+3
|
* use deterministic module IDs in production and developmentMike Greiling2017-03-031-0/+4
|
* Merge branch 'revert-320ef318' into 'master' Filipa Lacerda2017-03-032-8/+0
|\ | | | | | | | | Revert "Merge branch 'tooltip-hide-on-scroll' into 'master'" See merge request !9693
| * Revert "Merge branch 'tooltip-hide-on-scroll' into 'master'"revert-320ef318Phil Hughes2017-03-032-8/+0
| | | | | | This reverts merge request !9653
* | Merge branch 'patch-16' into 'master' Achilleas Pipinellis2017-03-031-3/+53
|\ \ | | | | | | | | | | | | | | | | | | add Microsoft Exchange reply by email details Closes #28131 See merge request !9482
| * | add Microsoft Exchange reply by email details Ben Bodenmiller2017-02-231-3/+53
| | | | | | | | | | | | | | | fix #28131 [skip ci]
* | | Merge branch '26847-api-pipelines-use-basic' into 'master' Robert Speicher2017-03-038-40/+250
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Expose pipelines as PipelineBasic `api/v4/projects/:id/pipelines` Closes #26847 See merge request !8875
| * | Expose pipelines as PipelineBasic `projects/:id/pipelines`26847-api-pipelines-use-basicToon Claes2017-03-038-40/+250
| | | | | | | | | | | | | | | | | | | | | | | | The `projects/:id/pipelines` exposed a lot of extra details that are superfluous and it was taking extra resources to fetch them. To get more details about a pipeline, use `projects/:id/pipelines/:pipeline_id`.
* | | Merge branch 'set-kube-ca-pem-to-file' into 'master' Kamil Trzciński2017-03-034-2/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add KUBE_CA_PEM_FILE, deprecate KUBE_CA_PEM Closes #25753 See merge request !9398
| * | | Add KUBE_CA_PEM_FILE, deprecate KUBE_CA_PEMNick Thomas2017-03-034-2/+18
|/ / /
* | | Merge branch 'dm-fix-cherry-pick' into 'master' Robert Speicher2017-03-0313-119/+111
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix cherry-picking or reverting through an MR Closes #28711 and #28426 See merge request !9640
| * | | Remove useless assignmentdm-fix-cherry-pickDouwe Maan2017-03-031-1/+1
| | | |
| * | | Use separate error class for cherry-pick and revert tree errorsDouwe Maan2017-03-022-11/+8
| | | |
| * | | Fix cherry-picking or reverting through an MRDouwe Maan2017-03-0213-117/+112
| | | |
* | | | Merge branch '28865-filter-by-authorized-projects-in-v4' into 'master' Sean McGivern2017-03-036-25/+65
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add filter param for user's authorized projects in V4 Closes #28865 See merge request !9674
| * | | | Rename query parameter to `membership`28865-filter-by-authorized-projects-in-v4Toon Claes2017-03-036-14/+19
| | | | | | | | | | | | | | | | | | | | The query parameter `membership` should be more self-explaining.
| * | | | Add filter param for authorized projects for current_user for V4Oswaldo Ferreira2017-03-035-22/+57
| | | | |
* | | | | Merge branch 'revert_disallow_system_notes_for_closed_issuables' into 'master' Sean McGivern2017-03-032-40/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Disallow system notes for closed issuables" Closes #28207 See merge request !9673
| * | | | | Revert "Disallow system notes for closed issuables"revert_disallow_system_notes_for_closed_issuablesFelipe Artur2017-03-022-40/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0771774480ce1f46b27b629d3721917d6c1f1267.
* | | | | | Merge branch '19497-hide-relevant-info-when-project-issues-are-disabled' ↵Sean McGivern2017-03-035-25/+106
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Hide issue info when project issues are disabled Closes #19497 See merge request !9083
| * | | | | | Hide issue info when project issues are disabledGeorge Andrinopoulos2017-03-025-25/+106
| | | | | | |
* | | | | | | Merge branch '3440-remove-hsts-header-from-rails-app' into 'master' 13251-docs-on-searchMarin Jankovski2017-03-034-4/+31
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Stop setting Strict-Transport-Securty header from within the app See merge request !9341
| * | | | | | Stop setting Strict-Transport-Securty header from within the appPaweł Chojnacki2017-03-034-4/+31
|/ / / / / /
* | | | | | Merge branch 'ee-comp-mr-2' into 'master' Sean McGivern2017-03-031-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve EE compatibility MR docs [ci skip] See merge request !9681
| * | | | | | Improve EE compatibility MR docs [ci skip] ee-comp-mr-2Adam Niedzielski2017-03-031-1/+4
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | EE MR should be updated before CE MR is merged. Suggest using "git rerere".
* | | | | | Merge branch 'rs-dev-seed-time' into 'master' Sean McGivern2017-03-032-12/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the `Gitlab::Seeder` monkey patch to disable mail delivery Closes #27609 See merge request !9678
| * | | | | | Fix the `Gitlab::Seeder` monkey patch to disable mail deliveryrs-dev-seed-timeRobert Speicher2017-03-022-12/+11
| | | | | | |
* | | | | | | Merge branch 'tooltip-hide-on-scroll' into 'master' Filipa Lacerda2017-03-032-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hides the tooltip on scroll See merge request !9653
| * | | | | | | Hides the tooltip on scrolltooltip-hide-on-scrollPhil Hughes2017-03-022-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is especially obvious on mobile. The tooltip opens on tap but there is no way to hide it, so this hides the tooltip after scrolling.
* | | | | | | | Merge branch 'fix/gb/fix-build-retry-tags-assignment' into 'master' Kamil Trzciński2017-03-033-25/+53
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix runner tags assignment when retrying a job Closes #28846 See merge request !9612
| * | | | | | | Fix Rubocop offense in build retry servicefix/gb/fix-build-retry-tags-assignmentGrzegorz Bizon2017-03-021-1/+1
| | | | | | | |
| * | | | | | | Move unused consts from retry build service to specsGrzegorz Bizon2017-03-022-23/+22
| | | | | | | |
| * | | | | | | Improve build retry service tests for cloning dataGrzegorz Bizon2017-03-012-2/+13
| | | | | | | |
| * | | | | | | Fix runner tags assignment when retrying a jobGrzegorz Bizon2017-03-013-23/+41
| | | | | | | |
* | | | | | | | Merge branch '27532_api_changes' into 'master' Sean McGivern2017-03-038-17/+317
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use iids as filter parameter Closes #27532 See merge request !9096
| * | | | | | | | Use iids as filter parameterJarka Kadlecova2017-03-028-17/+317
| | | | | | | | |
* | | | | | | | | Merge branch '28935-make-logo-smaller' into 'master' Alfredo Sumaran2017-03-033-4/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decrease tanuki logo size Closes #28935 See merge request !9676
| * | | | | | | | | Decrease tanuki logo sizeAnnabel Dunstone Gray2017-03-023-4/+8
| | | | | | | | | |
* | | | | | | | | | Merge branch '28010-mr-merge-button-default-to-danger' into 'master' Alfredo Sumaran2017-03-039-35/+122
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to dangerous MR merge button Closes #28010 See merge request !9245
| * | | | | | | | | Default to subtle MR mege button until CI status is available28010-mr-merge-button-default-to-dangerEric Eastwood2017-03-029-35/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9245
* | | | | | | | | | Merge branch 'remove_group_policy_add_rules' into 'master' Douwe Maan2017-03-021-6/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove now unnecessary `additional_rules!` method from GroupPolicy See merge request !9595
| * | | | | | | | | | Remove now unnecessary `additional_rules!` method from GroupPolicyDrew Blessing2017-02-281-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The intention was for this to be used to override group policy in EE. This led to all sort of strange problems in practice - for example, https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1025 needed to override `owner` permissions, but `additional_rules!` passed `master` only. The better solution is to use an EE module to override the policy. Removing this now defunct method.
View Lorry Controller Status