Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-04-19Merge branch '5320-fix-gitlab-features-env-var' into 'master'Grzegorz Bizon
Get GITLAB_FEATURES from Project#licensed_features instead of Namespace#features (#5320) See merge request gitlab-org/gitlab-ce!18189
2018-04-18Revert the addition of goldiloaderYorick Peterse
This reverts the addition of the "goldiloader" Gem and all use of it. While this Gem is very promising it's causing a variety of problems on GitLab.com due to it eager-loading too much data in places where we don't expect/can handle this. At least for the time being this means we have to go back to manually fixing N+1 query problems, but at least those should not cause a negative impact on availability.
2018-04-18Resolve "Make a Rubocop that forbids returning from a block"🙈 jacopo beschi 🙉
2018-04-09Add cop for has_many :through without disabled autoloadingSean McGivern
Goldiloader is great, but has several issues with has_many :through relations: * https://github.com/salsify/goldiloader/issues/12 * https://github.com/salsify/goldiloader/issues/14 * https://github.com/salsify/goldiloader/issues/18 Rather than try to figure out which applies in each case, we should just do the drudge work of manually disabling autoloading for all relations of this type. We can always use regular preloading for specific cases, but this way we avoid generating invalid queries through Goldiloader's magic.
2018-04-09Use Goldiloader for handling N+1 queriesYorick Peterse
Goldiloader (https://github.com/salsify/goldiloader) can eager load associations automatically. This removes the need for adding "includes" calls in a variety of different places. This also comes with the added benefit of not having to eager load data if it's not used.
2018-04-09Get GITLAB_FEATURES from Project#licensed_features instead of ↵Dylan Griffith
Namespace#features (#5320)
2018-04-07Include ProjectDeployTokensMayra Cabrera
Also: - Changes scopes from serializer to use boolean columns - Fixes broken specs
2018-04-07Create barebones for DeploytokenMayra Cabrera
Includes: - Model, factories, create service and controller actions - As usual, includes specs for everything - Builds UI (copy from PAT) - Add revoke action Closes #31591
2018-04-06Extend API for importing a project export with overwrite supportFrancisco Javier López
2018-04-05Merge branch 'bvl-override-import-params' into 'master'Douwe Maan
Allow passing params to import API to override project attributes Closes gitlab-ee#4788 See merge request gitlab-org/gitlab-ce!18086
2018-04-05Don't export `Project#description_html`Bob Van Landuyt
Since we can regenerate `description_html` from the `description`, we should not export it. This avoids some complexity when overriding the description during an import/export where we would need to invalidate this cached field. Now we refresh the markdown cache after the import
2018-04-05Merge branch 'use-chronic-duration-attribute-for-project-build-timeout' into ↵Kamil Trzciński
'master' Use chronic duration attribute for project build timeout See merge request gitlab-org/gitlab-ce!17386
2018-04-05Add helper for accessing lfs_objects for projectBob Van Landuyt
This makes accessing LFS Objects for a project easier project.lfs_storage_project.lfs_objects` becomes project.all_lfs_objects This will make the refactor in https://gitlab.com/gitlab-org/gitlab-ce/issues/39769 easier to deal with.
2018-04-04Specify default value for Project#build_timeoutTomasz Maczukin
2018-04-04Store override params as import data on projectsBob Van Landuyt
This means import data doesn't necessarily have to have an import_url anymore. The `ProjectImportData` could just contain the override data in it's serialized data attribute. The import data is automatically cleaned up after it is finished by the state machine.
2018-04-04Use ChronicDurationAttribute to handle CI/CD timeout settingTomasz Maczukin
2018-04-04Merge branch 'fix/use-shard-name-in-gitlab-projects-instead-of-shard-path' ↵Sean McGivern
into 'master' Use shard name in Git::GitlabProjects instead of shard path Closes gitaly#1110 See merge request gitlab-org/gitlab-ce!18015
2018-04-04[Rails5] Rename `sort` methods to `sort_by_attribute`blackst0ne
2018-04-03Use shard name in Git::GitlabProjects instead of shard pathAhmad Sherif
Closes gitaly#1110
2018-03-30Extend API for exporting a project with direct upload URLFrancisco Javier López
2018-03-29Add port number to artifacts links to gitlab-pages, if neededAlessio Caiazza
2018-03-23Merge branch 'pages_force_https' into 'master'Nick Thomas
HTTPS only Pages Closes #28857 See merge request gitlab-org/gitlab-ce!16273
2018-03-23Merge branch 'mark-legacy-git-access' into 'master'Sean McGivern
Route path lookups through legacy_disk_path See merge request gitlab-org/gitlab-ce!17743
2018-03-22Add HTTPS-only pagesRob Watson
Closes #28857
2018-03-21Route path lookups through legacy_disk_pathJacob Vosmaer
2018-03-21Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'Douwe Maan
Server Side Request Forgery in Services and Web Hooks See merge request gitlab/gitlabhq!2337
2018-03-19Merge branch '31114-internal-ids-are-not-atomic' into 'master'Sean McGivern
Atomic generation of internal ids for issues. Closes #31114 See merge request gitlab-org/gitlab-ce!17580
2018-03-18Merge branch 'fix/sm/clarify-ambiguous-with_artifacts-implication' into 'master'Kamil Trzciński
Clarify ambiguous with_artifacts implication Closes #44138 See merge request gitlab-org/gitlab-ce!17720
2018-03-16Adds the option to override project description on export via APITiago Botelho
and fixes the project description not being imported
2018-03-16Atomic generation of internal ids for issues.Andreas Brandl
2018-03-15Merge branch 'backstage/gb/refactor-ci-cd-variables-collections' into 'master'Kamil Trzciński
Introduce CI/CD variables collection Closes #33042 See merge request gitlab-org/gitlab-ce!14439
2018-03-15Use with_artifacts_archive name. Add specShinya Maeda
2018-03-15Clarify ambiguous with_artifacts implicationShinya Maeda
2018-03-14Improve predefined variables collection methodsGrzegorz Bizon
2018-03-14Port deployment variables skeleton code from EEGrzegorz Bizon
This commit backports method signatures and related implementation to the CE, to make CE and EE identical. This does not add any features from EE, it is only aimed to reduce conflicts between CE and EE in the future.
2018-03-14Merge branch 'master' into backstage/gb/refactor-ci-cd-variables-collectionsGrzegorz Bizon
* master: (211 commits)
2018-03-14Change Gitlab::Shell#add_namespace to #create_namespaceZeger-Jan van de Weg
Prior to this change, this method was called add_namespace, which broke the CRUD convention and made it harder to grep for what I was looking for. Given the change was a find and replace kind of fix, this was changed without opening an issue and on another feature branch. If more dynamic calls are made to add_namespace, these could've been missed which might lead to incorrect bahaviour. However, going through the commit log it seems thats not the case.
2018-03-13Make predefined variables in a collection public by defaultGrzegorz Bizon
2018-03-13DRY project-level predefined variablesGrzegorz Bizon
2018-03-12Use variables collection as build predefined variablesGrzegorz Bizon
2018-03-07Only allow users that can merge to push to sourceBob Van Landuyt
We only allow users that can merge the merge request to push to the fork.
2018-03-07Limit queries to a user-branch combinationBob Van Landuyt
The query becomes a lot simpler if we can check the branch name as well instead of having to load all branch names.
2018-03-07Allow abilities on forks while MR is openBob Van Landuyt
When an MR is created using `allow_maintainer_to_push`, we enable some abilities while the MR is open. This should allow every user with developer abilities on the target project, to push to the source project.
2018-03-06Merge branch 'master' into 'issue_38337'Felipe Artur
# Conflicts: # app/models/group.rb # db/schema.rb
2018-03-06Merge branch 'sh-dashboard-sort-fix' into 'master'Douwe Maan
Fix project dashboard showing the wrong timestamps Closes #27181 See merge request gitlab-org/gitlab-ce!17504
2018-03-06Merge branch '29130-api-project-export' into 'master'Sean McGivern
Resolve "API endpoint for exporting project" Closes #29130 See merge request gitlab-org/gitlab-ce!15860
2018-03-06Fix project dashboard showing the wrong timestampsStan Hu
Use the max of the `last_activity_at` and `last_repository_updated_at` columns. The latter is updated only when a push happens, but the former is updated whenever any activity (e.g. issue creation) happens. Closes #27181
2018-03-05review: rename import_export to import_export_sharedTravis Miller
2018-03-05Projects and groups badges APIFrancisco Javier López
2018-03-03Bring one group board to CEFelipe Artur