summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add dependency proxy to permissions.mddocs/dependency-proxy-permissionsDmitriy Zaporozhets2019-06-111-15/+16
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'patch-23' into 'master'Achilleas Pipinellis2019-06-111-0/+8
|\ | | | | | | | | Docs: enable numeric UIDs and GIDs for NFS See merge request gitlab-org/gitlab-ce!21712
| * Docs: enable numeric UIDs and GIDs for NFSBen Bodenmiller2019-06-111-0/+8
|/
* Merge branch '62788-graphql-pagination' into 'master'Phil Hughes2019-06-115-9/+140
|\ | | | | | | | | | | | | Creates pagination component graphql Closes #62788 See merge request gitlab-org/gitlab-ce!29277
| * Creates pagination component graphqlFilipa Lacerda2019-06-115-9/+140
| | | | | | | | | | creates a pagination component for the graphql api
* | Merge branch 'cg-gitlab-ce-admin-ha-title' into 'master'Achilleas Pipinellis2019-06-111-2/+1
|\ \ | | | | | | | | | | | | Take out JN title in text See merge request gitlab-org/gitlab-ce!29376
| * | Take out JN title in textCassiana Gudgenov2019-06-111-2/+1
|/ /
* | Merge branch 'jl-improve-wording-license-docs' into 'master'Achilleas Pipinellis2019-06-111-9/+3
|\ \ | | | | | | | | | | | | Improve wording for automatic license import See merge request gitlab-org/gitlab-ce!29330
| * | Improve wording for automatic license importJoshua Lambert2019-06-111-9/+3
|/ /
* | Merge branch 'docs-ci-videos' into 'master'Achilleas Pipinellis2019-06-116-16/+32
|\ \ | | | | | | | | | | | | | | | | | | Docs: CI - link videos Closes #62293 See merge request gitlab-org/gitlab-ce!29491
| * | Docs: CI - link videosMarcia Ramos2019-06-116-16/+32
|/ /
* | Merge branch 'docs-ssot-review-ci-examples' into 'master'Achilleas Pipinellis2019-06-1117-108/+148
|\ \ | | | | | | | | | | | | | | | | | | Update CI Examples section to confirm to SSOT Documentation standards Closes #61507 See merge request gitlab-org/gitlab-ce!29397
| * | Doc types on tutorials in top level examples folder, minor editsMike Lewis2019-06-1117-108/+148
|/ / | | | | | | Variety of edits to conform with SSOT doc style standards
* | Merge branch '62813-show-inline-diff-example-rendered' into 'master'Marcia Ramos2019-06-112-1/+5
|\ \ | | | | | | | | | | | | | | | | | | Show inline diff example rendered Closes #62813 See merge request gitlab-org/gitlab-ce!29239
| * | Replace rendered example with imageMark Lapierre2019-06-112-1/+5
|/ / | | | | | | | | Because the markdown wouldn't have been rendered on docs.gitlab.com
* | Merge branch '62760-use-time-zone-now' into 'master'Rémy Coutable2019-06-111-1/+2
|\ \ | | | | | | | | | | | | | | | | | | Use Time.zone.now for Ci::PipelineSchedule#ideal_next_run_at Closes #62760 See merge request gitlab-org/gitlab-ce!29275
| * | Use Time.zone.now for Ci::PipelineSchedule#ideal_next_run_atLin Jen-Shin2019-06-111-1/+2
|/ /
* | Merge branch 'docs-fix-alert-box' into 'master'Marcia Ramos2019-06-111-1/+1
|\ \ | | | | | | | | | | | | Use correct alert box See merge request gitlab-org/gitlab-ce!28268
| * | Use correct alert boxBen Bodenmiller2019-06-111-1/+1
|/ /
* | Merge branch 'fix-pipeline-schedule-owner-is-nil' into 'master'Stan Hu2019-06-113-1/+14
|\ \ | | | | | | | | | | | | | | | | | | Fix pipeline schedule when owner is nil Closes gitlab-com/gl-infra/production#805 and #63086 See merge request gitlab-org/gitlab-ce!29477
| * | Fix pipeline schedule when owner is nilfix-pipeline-schedule-owner-is-nilShinya Maeda2019-06-113-1/+14
| | | | | | | | | | | | Fixing the bug
* | | Merge branch 'docs/architecture-table-hack' into 'master'Marcia Ramos2019-06-111-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make the architecture table displayed in a block Closes #62990 See merge request gitlab-org/gitlab-ce!29470
| * | | Make the architecture table displayed in a blockdocs/architecture-table-hackAchilleas Pipinellis2019-06-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, all tables have a width of 100% on docs.gitlab.com. In a few cases, the table will overlap the table of contents (ToC). For these cases, we need to add an entry to the document’s frontmatter to render them as a display block.
* | | | Merge branch 'docs/subscriptions-ce-port' into 'master'Mike Lewis2019-06-111-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Port the subscriptions docs to CE See merge request gitlab-org/gitlab-ce!29484
| * | | | Port the subscriptions docs to CEdocs/subscriptions-ce-portAchilleas Pipinellis2019-06-111-0/+8
| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12072/diffs
* | | | | Merge branch 'jv-go-1.11.10' into 'master'Achilleas Pipinellis2019-06-112-8/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use Go 1.11.10 in source installations See merge request gitlab-org/gitlab-ce!29471
| * | | | | Use Go 1.11.10 in source installationsJacob Vosmaer2019-06-112-8/+8
|/ / / / /
* | | | | Merge branch 'docs-bulk-migrate-issues' into 'master'Tom Atkins2019-06-111-0/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adding documentation on how to bulk migrate issues See merge request gitlab-org/gitlab-ce!24530
| * | | | | Adding documentation on how to bulk migrate issuesdocs-bulk-migrate-issuesmac-key2019-01-211-0/+25
| | | | | |
* | | | | | Merge branch '62622-constrain-parent' into 'master'Fatih Acet2019-06-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipeline dropdown overflow Closes #62622 See merge request gitlab-org/gitlab-ce!29443
| * | | | | | Constrain parent so trunc works62622-constrain-parentsarahghp2019-06-101-1/+1
| | | | | | |
* | | | | | | Merge branch 'add-target-project-and-branch-to-merge-trains' into 'master'Kamil Trzciński2019-06-112-1/+19
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Persist target project id and target branch in merge trains table See merge request gitlab-org/gitlab-ce!29466
| * | | | | | Persist target project id and target branch in merge trains tableShinya Maeda2019-06-112-1/+19
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to optimize the query performance, we should use target project id and target branch intead of cross-joining merge_requests table. Fix schema Fix schema
* | | | | | Merge branch 'ignore-artifact-attirbutes-in-project-import-export' into 'master'James Lopez2019-06-114-1/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore legacy artifact columns in Project Import/Export Closes #63033 See merge request gitlab-org/gitlab-ce!29427
| * | | | | | Ignore legacy artifact columns in Project Import/ExportShinya Maeda2019-06-114-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore some columns
* | | | | | | Merge branch 'fix-diff-system-note-alignment' into 'master'Filipa Lacerda2019-06-111-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix system note alignment within diff See merge request gitlab-org/gitlab-ce!29446
| * | | | | | | Fix system note alignment within difffix-diff-system-note-alignmentAnnabel Dunstone Gray2019-06-101-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '58882-explicit-chrome-data-dir' into 'master'Thong Kuah2019-06-111-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly set Chrome user-data-dir See merge request gitlab-org/gitlab-ce!29459
| * | | | | | | Explicitly set Chrome user-data-dir58882-explicit-chrome-data-dirHeinrich Lee Yu2019-06-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a temporary measure to prevent some system specs causing Chrome to crash
* | | | | | | | Merge branch 'prom-api-1' into 'master'Sean McGivern2019-06-1112-18/+94
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update server API to enable switch prometheus endpoint See merge request gitlab-org/gitlab-ce!29186
| * | | | | | | | Switch errors to inherit from a base classprom-api-1syasonik2019-06-065-25/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error classes associated with individual stages of dashboard processing tend to have very long names. As dashboard post-processing includes more steps, we will likely need to handle more error cases. Refactoring to have all errors inherit from a specific base class will help accommodate this and keep the code more readable.
| * | | | | | | | Address rubocop errorssyasonik2019-06-062-3/+5
| | | | | | | | |
| * | | | | | | | Expose prometheus endpoint per metric in dashboardsyasonik2019-06-068-8/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a new stage to dashboard processesing step for the EnvironmentsController::metrics_dashboard endpoint. Allows the front end to avoid generating the endpoint unitutive string mutations.
| * | | | | | | | Named route for prometheus proxy_pathSimon Knox2019-06-061-1/+1
| | | | | | | | |
| * | | | | | | | Return no_content from prometheus API empty responseSimon Knox2019-06-062-3/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'add-default-reactive-cache-key' into 'master'Nick Thomas2019-06-115-5/+15
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a default reactive cache key See merge request gitlab-org/gitlab-ce!29337
| * | | | | | | | | Add a default reactive cache keyadd-default-reactive-cache-keyTiger2019-06-075-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aligns with the other reactive cache options by providing a default that can be overridden if necessary.
* | | | | | | | | | Merge branch 'add-eread-as-codeowner-doc' into 'master'Achilleas Pipinellis2019-06-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add eread as CODEOWNER for doc dir See merge request gitlab-org/gitlab-ce!29456
| * | | | | | | | | | Add eread as CODEOWNER for doc dirEvan Read2019-06-111-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'add-lfs-blob-ids-to-tree-type' into 'master'Filipa Lacerda2019-06-1111-2/+87
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add LFS blob IDs to GraphQL tree type See merge request gitlab-org/gitlab-ce!28666
View Lorry Controller Status