summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | Fix outdated web ide copyjr-46209-web-ide-copyJames Ramsay2018-05-102-2/+7
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch ↵Nick Thomas2018-05-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41229-include-the-human-repo-name-in-gitlab-shell-log-when-hashed-storage-is-in-use' into 'master' Resolve "Include the human repo name in gitlab-shell.log when hashed storage is in use" Closes #41229 See merge request gitlab-org/gitlab-ce!18870
| * | | | | | | | | | | Include project.full_path when moving repoAsh McKenzie2018-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is especially helpful when hashed storage is enabled
* | | | | | | | | | | | Merge branch 'sh-reset-prometheus-metrics-tests' into 'master'Nick Thomas2018-05-106-3/+41
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support resetting of Prometheus metrics between test runs Closes #39968 See merge request gitlab-org/gitlab-ce!18836
| * | | | | | | | | | | | Support resetting of Prometheus metrics between test runsStan Hu2018-05-096-3/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the :prometheus tag to an rspec test will clear out memory-mapped files and reset the registry. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39968
* | | | | | | | | | | | | Merge branch 'jej/fix-accidental-ee-directory' into 'master'Dmitriy Zaporozhets2018-05-102-51/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove accidental EE additions in CE See merge request gitlab-org/gitlab-ce!18877
| * | | | | | | | | | | | | Remove accidental EE additions in CEjej/fix-accidental-ee-directoryJames Edwards-Jones2018-05-102-51/+0
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'mk/fix-intermittent-qa-test-failure' into 'master'Grzegorz Bizon2018-05-102-14/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve fix for intermittent QA failure in "cloning code using a deploy key" Closes charts/gitlab#396 See merge request gitlab-org/gitlab-ce!18608
| * | | | | | | | | | | | | | Succeed or fail fast based on job status firstMichael Kozono2018-05-082-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, move wait block into the correct page block.
* | | | | | | | | | | | | | | Merge branch '45442-updates-updated-at-to-issue-on-time-spent' into 'master'Douwe Maan2018-05-104-9/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update `updated_at` on an issue when label or time spent was added" Closes #45442 See merge request gitlab-org/gitlab-ce!18757
| * | | | | | | | | | | | | | | Updates updated_at on issue when using /spend quick actionJacopo2018-05-094-9/+48
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ce-jej/group-saml-skip-forgery-protection' into 'master'Douwe Maan2018-05-101-5/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Backport with_forgery_protection spec helper See merge request gitlab-org/gitlab-ce!18833
| * | | | | | | | | | | | | | Backport with_forgery_protection spec helperJames Edwards-Jones2018-05-081-5/+12
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch ↵Douwe Maan2018-05-105-17/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'backport-rd-5566-improve-performance-of-repository-size-limit-check' into 'master' Backport some changes from gitlab-ee!5476 See merge request gitlab-org/gitlab-ce!18760
| * | | | | | | | | | | | | | | Backport some changes from gitlab-ee!5476Rubén Dávila2018-05-095-17/+55
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The lib/gitlab/git/repository.rb needs to have the same content between gitlab-ce and gitlab-ee in order to have Gitaly working fine.
* | | | | | | | | | | | | | | Merge branch '46147-remove-model-redefinition-worker' into 'master'Douwe Maan2018-05-102-149/+95
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "NoMethodError: undefined method `uploader_context' for #<ObjectStorage::MigrateUploadsWorker::Upload:0x00007f59e..." Closes #46147 See merge request gitlab-org/gitlab-ce!18820
| * | | | | | | | | | | | | | apply feedbackMicaël Bergeron2018-05-091-3/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | remove the `Upload` redefinition in `MigrateUploadsWorker`Micaël Bergeron2018-05-082-149/+95
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'blackst0ne-replace-spinach-project-issues-references.feature' ↵Robert Speicher2018-05-096-254/+272
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Replace the `project/issues/references.feature` spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!18769
| * | | | | | | | | | | | | | | Replace the `project/issues/references.feature` spinach test with an rspec ↵blackst0ne2018-05-096-254/+272
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | analog
* | | | | | | | | | | | | | | Merge branch 'blackst0ne-replace-spinach-project-deploy-keys.feature' into ↵Robert Speicher2018-05-095-144/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Replace the `project/deploy_keys.feature` spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!18796
| * | | | | | | | | | | | | | Replace the `project/deploy_keys.feature` spinach test with an rspec analogblackst0ne2018-05-095-144/+130
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch '46032/cycle-analytics-service-axios' into 'master'Clement Ho2018-05-092-15/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactor 'cycle_analytics' to use axios See merge request gitlab-org/gitlab-ce!18782
| * | | | | | | | | | | | | refactor 'cycle_analytics' to use axiosPaul Slaughter2018-05-092-15/+17
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'dm-repository-xcode-project' into 'master'Robert Speicher2018-05-093-3/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Repository#xcode_project? method See merge request gitlab-org/gitlab-ce!18854
| * | | | | | | | | | | | | Add Repository#xcode_project? methodDouwe Maan2018-05-093-3/+41
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '46032/deploy-keys-axios' into 'master'Clement Ho2018-05-094-40/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactor "deploy_keys" to use axios See merge request gitlab-org/gitlab-ce!18792
| * | | | | | | | | | | | | | refactor "deploy_keys" to use axiosPaul Slaughter2018-05-094-40/+24
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'fix-project-mirror-data-schema' into 'master'Douwe Maan2018-05-095-2/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project mirror data schema See merge request gitlab-org/gitlab-ce!18811
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'fix-project-mirror-data-schema'Douwe Maan2018-05-09197-1728/+1367
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | | | | | | | | Adds changelogTiago Botelho2018-05-081-0/+6
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Adds unique constraint to ProjectMirrorData project_id indexTiago Botelho2018-05-082-2/+33
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Adds not null constraint to ProjectMirrorData's foreign_key project_idTiago Botelho2018-05-083-2/+41
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jivl-delete-d3-rails-gem' into 'master'Douwe Maan2018-05-092-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the d3_rails gem See merge request gitlab-org/gitlab-ce!18860
| * | | | | | | | | | | | | | Removed the d3_rails gemJose2018-05-092-6/+0
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'docs/bdo-inclusive-language-groups-docs' into 'master'🚄 Job van der Voort 🚀2018-05-091-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation to use inclusive language, gender neutral name and pronoun. See merge request gitlab-org/gitlab-ce!18858
| * | | | | | | | | | | | | | | Update documentation to use inclusive language, gender neutral name and pronoun.Brendan O'Leary 🐢2018-05-091-10/+10
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '45840-fix-cache-key-docs' into 'master'Achilleas Pipinellis2018-05-091-7/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Incorrect documentation for .gitlab-ci.yml cache:key default value" Closes #45840 See merge request gitlab-org/gitlab-ce!18841
| * | | | | | | | | | | | | | | Fix cache:key documentation for the default valueLin Jen-Shin2018-05-091-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Re-apply changes from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9666 * Update the wordings accordingly for the current revision * Update the example to make it less confusing
* | | | | | | | | | | | | | | | Merge branch 'docs-fix-duplicate-titles' into 'master'Achilleas Pipinellis2018-05-0920-109/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: fix duplicate titles Closes #46061 See merge request gitlab-org/gitlab-ce!18758
| * | | | | | | | | | | | | | | | Docs: fix duplicate titlesMarcia Ramos 🚫 (OOO - back on May 21)2018-05-0920-109/+52
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'fix/gb/add-missing-foreign-key-to-database-schema' into 'master'Kamil Trzciński2018-05-091-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing pipeline build foreign key to the schema See merge request gitlab-org/gitlab-ce!18846
| * | | | | | | | | | | | | | | | Add missing pipeline build foreign key to the schemaGrzegorz Bizon2018-05-091-0/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'fix/gb/add-tmp-index-to-improve-stages-migration-cleanup' into ↵Kamil Trzciński2018-05-091-1/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add tmp index to ci_builds to optimize stages migration Closes #46179 See merge request gitlab-org/gitlab-ce!18844
| * | | | | | | | | | | | | | | | Add tmp index to ci_builds to optimize stages migrationGrzegorz Bizon2018-05-091-1/+34
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'zj-remove-rugged-call' into 'master'Robert Speicher2018-05-091-7/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove rugged call in blame controller See merge request gitlab-org/gitlab-ce!18817
| * | | | | | | | | | | | | | | Remove rugged call in blame controllerZeger-Jan van de Weg2018-05-081-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetching commits through #lookup uses rugged, and this is phased out. Also adds a short circuit in the `feature_enabled?` Gitaly method to allow Gitaly to be used when objects are set up with `let` before an example is run.
* | | | | | | | | | | | | | | | Merge branch 'docs-update-docstyleguide' into 'master'Achilleas Pipinellis2018-05-091-23/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: update docs style guidelines Closes #46157 and #45321 See merge request gitlab-org/gitlab-ce!18819
| * | | | | | | | | | | | | | | Docs: update docs style guidelinesMarcia Ramos 🚫 (OOO - back on May 21)2018-05-091-23/+91
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'support-active-setting-while-registering-a-runner' into 'master'Kamil Trzciński2018-05-093-1/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support 'active' setting on Runner Registration API endpoint See merge request gitlab-org/gitlab-ce!18848