summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Clarify local vs remote file integrity checkmk/rake-task-verify-remote-filesMichael Kozono2018-06-131-3/+4
|
* Stop using exception flow for known failuresMichael Kozono2018-06-125-20/+30
|
* Rename batch variableMichael Kozono2018-06-121-5/+5
|
* Refactor for readabilityMichael Kozono2018-06-121-7/+3
|
* Rename colliding method nameMichael Kozono2018-06-124-9/+9
| | | | It only affects the `Gitlab::Verify::JobArtifacts` class, and for the life of me I don’t know where it comes from. The conflicting method returns a `ActiveRecord::Relation` of `Ci:JobArtifact`, but it only returns a subset of them in my tests on staging.
* Fix Google API loggerMichael Kozono2018-06-121-0/+10
| | | | Something weird going on: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19501#note_79439386
* Be sure to perform hard check of remote objectMichael Kozono2018-06-127-10/+19
| | | | Also, don’t guard against `nil` `Uploader`s or `nil` `CarrierWave::Storage::Fog::File`s, since the verify task collects exceptions properly. This will help reveal more information if something is missing.
* Add changelog entryMichael Kozono2018-06-121-0/+5
|
* Support verifying remote job artifactsMichael Kozono2018-06-122-0/+24
|
* Support verifying remote LFS objectsMichael Kozono2018-06-124-8/+25
|
* Support verifying remote store uploadsMichael Kozono2018-06-125-10/+44
|
* Merge branch '47773-search-bar' into 'master'Clement Ho2018-06-121-0/+2
|\ | | | | | | | | | | | | Resolve "Project search in navbar is missing top margin in dev.gitlab.com" Closes #47773 See merge request gitlab-org/gitlab-ce!19718
| * Align nav bar itemsAnnabel Dunstone Gray2018-06-121-0/+2
| |
* | Merge branch 'sh-update-unicorn-rb-example' into 'master'Robert Speicher2018-06-121-0/+11
|\ \ | | | | | | | | | | | | Clean up stale Prometheus metrics in before_exec unicorn hook See merge request gitlab-org/gitlab-ce!19683
| * | Clean up stale Prometheus metrics in before_exec unicorn hooksh-update-unicorn-rb-exampleStan Hu2018-06-111-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Issuing a SIGUSR2 to a unicorn involves a dance where new workers are spun up before the old ones are shut down. To ensure Prometheus .db files aren't deleted after the new workers are shut down, we need to clean these files up before the unicorn process is run. Relates to https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/2582
* | | Merge branch '47265-inputs-labels-alignment' into 'master'Clement Ho2018-06-121-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Alignment of labels within two column layouts for radio and check boxes" Closes #47265 See merge request gitlab-org/gitlab-ce!19671
| * | | Remove top padding from .col-form-label47265-inputs-labels-alignmentAnnabel Dunstone Gray2018-06-111-0/+1
| | | |
* | | | Merge branch 'fix-labels-too-large-from-label-list-redesign' into 'master'Annabel Gray2018-06-121-1/+5
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fix labels too large Closes #47499 and #47762 See merge request gitlab-org/gitlab-ce!19640
| * | | Fix labels too largeLuke Bennett2018-06-121-1/+5
|/ / /
* | | Merge branch 'ide-job-loading-empty-state' into 'master'Filipa Lacerda2018-06-122-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed IDE jobs empty state showing when loading Closes #47766 See merge request gitlab-org/gitlab-ce!19706
| * | | Fixed IDE jobs empty state showing when loadingide-job-loading-empty-statePhil Hughes2018-06-122-0/+6
| | | | | | | | | | | | | | | | Closes #47766
* | | | Merge branch 'pr-importer-io-extra-error-handling' into 'master'Nick Thomas2018-06-123-1/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure MR diffs always exist in the PR importer Closes #47312 See merge request gitlab-org/gitlab-ce!19704
| * | | | Ensure MR diffs always exist in the PR importerpr-importer-io-extra-error-handlingYorick Peterse2018-06-123-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In rare cases it could happen that an MR was created, but creating the MR diffs somehow failed (e.g. due to an error). This commit adds an additional check to make sure MR diffs are always present when importing GitHub pull requests.
* | | | | Merge branch 'gitaly-disk-access-3' into 'master'Douwe Maan2018-06-1231-185/+301
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Find and mark more Git disk access locations, part 2 See merge request gitlab-org/gitlab-ce!19437
| * | | | | Find and mark more Git disk access locations, part 2Jacob Vosmaer2018-06-1231-185/+301
| | | | | |
* | | | | | Merge branch 'fix/br-decode' into 'master'Phil Hughes2018-06-123-6/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | mergeError message has been binded using v-html directive See merge request gitlab-org/gitlab-ce!19058
| * | | | | | mergeError message has been binded using v-html directiveMurat Dogan2018-06-123-6/+30
|/ / / / / /
* | | | | | Merge branch 'replace-dots-with-ellipsis' into 'master'Annabel Gray2018-06-1213-17/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace ... with ellipsis in placeholders See merge request gitlab-org/gitlab-ce!19627
| * | | | | | Replace ... with ellipsis in placeholdersreplace-dots-with-ellipsisAndreas Kämmerle2018-06-1113-17/+17
| | | | | | |
* | | | | | | Merge branch 'fj-bumping-gollum-lib-and-gollum-rugged-adapter' into 'master'Douwe Maan2018-06-123-2/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter Closes #47577 See merge request gitlab-org/gitlab-ce!19641
| * | | | | | | Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapterFrancisco Javier López2018-06-123-2/+23
|/ / / / / / /
* | | | | | | Merge branch 'docs-using-links-without-splitting-translated-sentences' into ↵Douwe Maan2018-06-121-1/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' i18n: document how to use links without splitting sentences See merge request gitlab-org/gitlab-ce!19682
| * | | | | | | i18n: document how to use links without splitting sentencesDennis Tang2018-06-121-1/+22
|/ / / / / / /
* | | | | | | Merge branch 'expose-ci-url' into 'master'Grzegorz Bizon | off until 20th June2018-06-126-2/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CI_{PIPELINE,JOB}_URL See merge request gitlab-org/gitlab-ce!19618
| * | | | | | | Add CI_{PIPELINE,JOB}_URLexpose-ci-urlKamil Trzciński2018-06-126-2/+16
| | | | | | | |
* | | | | | | | Merge branch ↵Rémy Coutable2018-06-122-9/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'blackst0ne-rails5-actionview-missingtemplate-in-spec-features-projects-wiki-user_views_wiki_page_spec-rb' into 'master' Resolve "[Rails5] `ActionView::MissingTemplate` in spec/features/projects/wiki/user_views_wiki_page_spec.rb" Closes #47738 See merge request gitlab-org/gitlab-ce!19685
| * | | | | | | | Resolve "[Rails5] `ActionView::MissingTemplate` in ↵blackst0ne2018-06-122-9/+13
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | spec/features/projects/wiki/user_views_wiki_page_spec.rb"
* | | | | | | | Merge branch 'blackst0ne-add-gemfile-rails5-lock-check' into 'master'Rémy Coutable2018-06-123-0/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CI job to check Gemfile.rails5.lock See merge request gitlab-org/gitlab-ce!19605
| * | | | | | | | Add CI job to check Gemfile.rails5.lockblackst0ne2018-06-123-0/+31
|/ / / / / / / /
* | | | | | | | Merge branch 'mk/remove-unnecessary-and-broken-example-docs' into 'master'Marin Jankovski2018-06-121-5/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary and broken example See merge request gitlab-org/gitlab-ce!19598
| * | | | | | | Remove unnecessary and broken examplemk/remove-unnecessary-and-broken-example-docsMichael Kozono2018-06-081-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example provided was broken because it mistakes a bug for a regression. It is not needed for clarity anyway. The milestone part is no longer relevant as well.
* | | | | | | | Merge branch 'da-port-cte-to-ce' into 'master'Yorick Peterse2018-06-123-0/+97
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitlab::SQL:CTE for easily building CTE statements See merge request gitlab-org/gitlab-ce!19652
| * | | | | | | | Add CHANGELOGda-port-cte-to-ceDouglas Barbosa Alexandre2018-06-111-0/+5
| | | | | | | | |
| * | | | | | | | Add Gitlab::SQL:CTE for easily building CTE statementsDouglas Barbosa Alexandre2018-06-112-0/+92
| | | | | | | | |
* | | | | | | | | Merge branch 'qa-112-fix-auto-devops-cluster-spec' into 'master'Grzegorz Bizon | off until 20th June2018-06-124-5/+28
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qa 112 fix auto devops cluster spec See merge request gitlab-org/gitlab-ce!19584
| * | | | | | | | | Move ENV variables to Runtime::Env for auto devops QAqa-112-fix-auto-devops-cluster-specDylan Griffith2018-06-112-9/+17
| | | | | | | | | |
| * | | | | | | | | Explicitly require pathname in QA stepsDylan Griffith2018-06-082-0/+4
| | | | | | | | | |
| * | | | | | | | | Ensure --zone is passed to all gcloud commands for auto devops cluster specsDylan Griffith2018-06-081-3/+14
| | | | | | | | | |
* | | | | | | | | | Merge branch 'dz-use-nip-io' into 'master'Grzegorz Bizon | off until 20th June2018-06-124-16/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use nip.io instead of xip.io See merge request gitlab-org/gitlab-ce!19688
| * | | | | | | | | | Use nip.io instead of xip.iodz-use-nip-ioDmitriy Zaporozhets2018-06-124-16/+16
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>