summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Use data_source_exists? instead of table_exists?rails5-databaseJarka Kadlecová2018-06-142-3/+7
| | | | Use data_source_exists? where possible instead of table_exists? in order to be Rails5 compatible
* Support LFS objects when creating a project by importFrancisco Javier López2018-06-066-5/+106
|
* Merge branch '42751-rename-master-to-maintainer' into 'master'Sean McGivern2018-06-063-11/+11
|\ | | | | | | | | | | | | Resolve "Rename the `Master` role to `Maintainer`" Closes #42751 See merge request gitlab-org/gitlab-ce!19080
| * change wordingMark Chao2018-06-061-1/+1
| |
| * wordingMark Chao2018-06-061-2/+2
| |
| * Rename master to maintainerMark Chao2018-06-061-8/+8
| |
* | Merge branch 'live-trace-v2-persist-data' into 'master'Kamil Trzciński2018-06-061-2/+22
|\ \ | | | | | | | | | | | | Live trace: Rescue stale live trace See merge request gitlab-org/gitlab-ce!18680
| * | Fix the query to select stale live tracesShinya Maeda2018-06-061-19/+23
| | |
| * | Fix ambiguous stuck ci job worker's spec. Rename lease key of archiveShinya Maeda2018-06-061-1/+1
| | |
| * | Add exclusive relase for trace arhiveShinya Maeda2018-06-061-14/+30
| | |
* | | Merge branch 'gitaly-find-commit-go-git' into 'master'Sean McGivern2018-06-062-0/+17
|\ \ \ | |_|/ |/| | | | | | | | Add feature flag for using go-git in Gitaly See merge request gitlab-org/gitlab-ce!19305
| * | Rescue from failed feature lookupsJacob Vosmaer2018-06-061-0/+4
| | |
| * | Simplify server feature flagsJacob Vosmaer2018-06-062-15/+7
| | |
| * | Set Gitaly Server feature flags from RailsZeger-Jan van de Weg2018-06-062-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly itself hold very little state, other than the data on disk. This limits the interfaces to set feature flags. Gitaly now has the ability to interpret the request metadata to check for feature flags. https://gitlab.com/gitlab-org/gitaly/merge_requests/704 This allows clients control on the Gitaly server, and given that Rails has an internal chatops interface to set these values this was chosen as solution. Known limitation right now, is that this package doesn't support the opt out that other Gitaly features do.
* | | Merge branch '47189-github_import_visibility' into 'master'Douwe Maan2018-06-061-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use Github repo visibility during import while respecting restricted visibility levels Closes #47189 See merge request gitlab-org/gitlab-ce!19450
| * | | Use Github repo visibility during import while respecting restricted ↵Imre Farkas2018-06-061-1/+4
| | | | | | | | | | | | | | | | visibility levels
* | | | Merge branch '45821-avatar_api' into 'master'Rémy Coutable2018-06-063-0/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Avatar API Closes #45821 See merge request gitlab-org/gitlab-ce!19121
| * | | | Add Avatar APIImre2018-06-063-0/+28
| | | | |
* | | | | Merge branch 'bvl-graphql-start-34754' into 'master'Douwe Maan2018-06-067-0/+166
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | GraphQL setup: Basic Project and Merge request endpoint Closes #34754 See merge request gitlab-org/gitlab-ce!19008
| * | | | Initial setup GraphQL using graphql-ruby 1.8Bob Van Landuyt2018-06-065-69/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - All definitions have been replaced by classes: http://graphql-ruby.org/schema/class_based_api.html - Authorization & Presentation have been refactored to work in the class based system - Loaders have been replaced by resolvers - Times are now coersed as ISO 8601
| * | | | Handle exceptions outside the GraphQL schemaBob Van Landuyt2018-06-052-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | This allows us to report JSON parse exceptions to clients and ignore them in sentry.
| * | | | Add `present_using` to typesBob Van Landuyt2018-06-051-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By specifying a presenter for the object type, we can keep the logic out of `GitlabSchema`. The presenter gets initialized using the object being presented, and the context (including the `current_user`).
| * | | | Convert from GraphQL::Batch to BatchLoaderNick Thomas2018-06-051-0/+2
| | | | |
| * | | | Add a minimal GraphQL APINick Thomas2018-06-051-0/+55
| | | | |
* | | | | Merge branch '25045-add-variables-to-post-pipeline-api' into 'master'Grzegorz Bizon2018-06-061-1/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Resolve "POST api/v4/projects/:id/pipeline should accept variables" Closes #25045 See merge request gitlab-org/gitlab-ce!19124
| * | | | Removes variables from pipelines apiJacopo2018-06-051-1/+0
| | | | |
| * | | | Review 1Jacopo2018-06-011-1/+5
| | | | |
| * | | | Rename variables_attributes => variables and adds spec for exclude/only optionJacopo2018-06-011-2/+2
| | | | |
| * | | | Adds variables to POST api/v4/projects/:id/pipelineJacopo2018-06-012-0/+2
| | | | |
* | | | | Merge branch 'sh-reject-non-utf8-gpg' into 'master'Robert Speicher2018-06-051-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject GPG keys that have e-mail or names with non-valid UTF-8 encodings Closes #47280 See merge request gitlab-org/gitlab-ce!19455
| * | | | | Reject GPG keys that have e-mail or names with non-valid UTF-8 encodingsStan Hu2018-06-051-1/+5
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | These were causing 500 Errors when accessing GPG keys for some users. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/47280
* | | | | Fix repository archive generation when hashed storage is enabledNick Thomas2018-06-051-8/+4
|/ / / /
* | | | Merge branch 'master' into ↵Kamil Trzciński2018-06-0514-30/+43
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | 'backstage/gb/use-persisted-stages-to-improve-pipelines-table' # Conflicts: # db/schema.rb
| * | | Find and mark more Git disk access locationsJacob Vosmaer (GitLab)2018-06-0510-27/+36
| | | |
| * | | Merge branch 'sh-fix-events-nplus-one' into 'master'Rémy Coutable2018-06-051-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Eliminate N+1 queries with authors and push_data_payload in Events API See merge request gitlab-org/gitlab-ce!19347
| | * | | Eliminate N+1 queries with authors and push_data_payload in Events APIStan Hu2018-06-051-0/+1
| | | | |
| * | | | Merge branch '42751-rename-mr-maintainer-push' into 'master'Robert Speicher2018-06-053-3/+6
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Rephrase Merge Request Maintainer Edit See merge request gitlab-org/gitlab-ce!19061
| | * | | Rephrase "maintainer" to more precise "members who can merge to the target ↵42751-rename-mr-maintainer-pushMark Chao2018-06-013-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | branch" "Maintainer" will be freed to be used for #42751
* | | | | Merge branch 'master' into ↵Grzegorz Bizon2018-06-0510-23/+261
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | 'backstage/gb/use-persisted-stages-to-improve-pipelines-table' # Conflicts: # db/schema.rb
| * | | | Prevent Gitaly WriteConfig log noiseJacob Vosmaer (GitLab)2018-06-051-0/+5
| | | | |
| * | | | Merge branch 'add-background-migrations-for-not-archived-traces' into 'master'Kamil Trzciński2018-06-052-3/+25
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add background migrations to archive legacy job traces Closes #46642 See merge request gitlab-org/gitlab-ce!19194
| | * | | | Revise comments in ArchiveLegacyTracesShinya Maeda2018-06-041-3/+3
| | | | | |
| | * | | | Directly refer application code from migration codeShinya Maeda2018-06-042-69/+12
| | | | | |
| | * | | | Add background migrations to arhive legacy tracesShinya Maeda2018-06-041-0/+79
| | | |_|/ | | |/| |
| * | | | Merge branch 'override-consider-extend' into 'master'Nick Thomas2018-06-051-3/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Also verify if extending would override a class method See merge request gitlab-org/gitlab-ce!19377
| | * | | | Also verify if extending would override a class methodoverride-consider-extendLin Jen-Shin2018-06-051-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since extending a class means including on the singleton class of the class, this should now complain this: ``` ruby module M extend Gitlab::Utils::Override override :f def f super.succ end end class C extend M def self.f 0 end end ``` It should complain because `C.f` wasn't calling `M#f`. This should pass verification: ``` ruby module M extend Gitlab::Utils::Override override :f def f super.succ end end class B def self.f 0 end end class C < B extend M end ``` Because `C.f` would now call `M#f`, and `M#f` does override something.
| * | | | | Merge branch 'gh-importer-transactions' into 'master'Nick Thomas2018-06-051-14/+42
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perform pull request IO work outside a transaction See merge request gitlab-org/gitlab-ce!19372
| | * | | | | Perform pull request IO work outside a transactiongh-importer-transactionsYorick Peterse2018-06-041-14/+42
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When importing a GitHub pull request we would perform all work in a single database transaction. This is less than ideal, because we perform various slow Git operations when creating a merge request. This in turn can lead to many DB connections being used, while just waiting for an IO operation to complete. To work around this, we now move most of the heavy lifting out of the database transaction. Some extra error handling is added to ensure we can resume importing a partially imported pull request, instead of just throwing an error. This commit also changes the specs for IssueImporter so they don't rely on deprecated RSpec methods.
| * | | | | Merge branch 'sh-fix-pipeline-jobs-nplus-one' into 'master'Rémy Coutable2018-06-051-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminate N+1 queries for CI job artifacts in /api/projects/:id/pipelines/:pipeline_id/jobs See merge request gitlab-org/gitlab-ce!19353
| | * | | | | Eliminate N+1 queries for CI job artifacts in ↵sh-fix-pipeline-jobs-nplus-oneStan Hu2018-06-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | /api/projects/:id/pipelines/:pipeline_id/jobs