Commit Graph

420 Commits

Author SHA1 Message Date
Alessio Caiazza b782ba1113
Add name, author and sha to releases
This commit adds a name to each release, defaulting it to tag name,
keeps track of the SHA when a new release is created and tracks the
current user as release author.
2018-12-13 12:15:21 +01:00
Rémy Coutable eadd53b969 Merge branch 'sh-remove-gitlab-shell-include' into 'master'
Remove unnecessary includes of ShellAdapter

See merge request gitlab-org/gitlab-ce!23607
2018-12-10 16:22:53 +00:00
Kamil Trzciński a910c09bbc Encrypt CI/CD builds tokens
Brings back 1e8f1de0 reverted in !23644

Closes #52342

See merge request gitlab-org/gitlab-ce!23436
2018-12-07 10:42:47 +01:00
Robert Speicher 950b9130ad
Revert "Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'"
This reverts commit 1e8f1de034, reversing
changes made to 62d971129d.
2018-12-06 18:53:24 -06:00
Nick Thomas 9395d198f9
Use BFG object maps to clean projects 2018-12-06 18:58:00 +00:00
Kamil Trzciński 1e8f1de034 Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'
Encrypt CI/CD builds tokens

Closes #52342

See merge request gitlab-org/gitlab-ce!23436
2018-12-06 09:42:18 +00:00
Stan Hu e96fd232a6 Remove unnecessary includes of ShellAdapter
Determined by running the script:

```
included = `git grep --name-only ShellAdapter`.chomp.split("\n")
used = `git grep --name-only gitlab_shell`.chomp.split("\n")
included - used
```
2018-12-05 23:19:27 -08:00
Francisco Javier López a6778fc647 Rename project's pipelines relation 2018-12-05 14:39:15 +00:00
Grzegorz Bizon ca2c5ddba7 Exclude encrypted build token from import/export and retries 2018-12-05 10:53:48 +01:00
Grzegorz Bizon 0b8a2779e7 Merge branch 'master' into fix/gb/encrypt-runners-tokens
* master: (243 commits)

Conflicts:
	db/schema.rb
	lib/gitlab/import_export/import_export.yml
2018-11-28 13:14:04 +01:00
Tiago Botelho 4bd8a427d4
Removes all the irrelevant import related code and columns
Clears the import related columns and code from the Project
model over to the ProjectImportState model
2018-11-27 12:58:13 +00:00
Grzegorz Bizon 88e2b6ea9f Merge remote-tracking branch 'dev/master' into security-encrypt-runners-tokens
* dev/master: (302 commits)

Conflicts:
	db/schema.rb
	lib/gitlab/import_export/import_export.yml
2018-11-21 11:02:31 +01:00
Grzegorz Bizon e491df5fc6 Encrypt runners communication token in the database 2018-11-20 16:30:39 +01:00
Grzegorz Bizon 478c15fa89 Exclude runners tokens from GitLab project exports 2018-11-20 16:15:09 +01:00
Steve Azzopardi 282a5b4c84
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2018-11-20 10:11:42 +01:00
Stan Hu 2e3674f7a8 Prevent templated services from being imported
Templated services should only be created by admins and does not
apply to project import/export.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54189
2018-11-19 15:41:41 -08:00
gfyoung 7ec8af5017 Enable even more frozen string for lib/gitlab
Enables frozen string for the following:

* lib/gitlab/hook_data/**/*.rb
* lib/gitlab/i18n/**/*.rb
* lib/gitlab/import/**/*.rb
* lib/gitlab/import_export/**/*.rb
* lib/gitlab/kubernetes/**/*.rb
* lib/gitlab/legacy_github_import/**/*.rb
* lib/gitlab/manifest_import/**/*.rb
* lib/gitlab/metrics/**/*.rb
* lib/gitlab/middleware/**/*.rb

Partially addresses gitlab-org/gitlab-ce#47424.
2018-11-16 17:41:14 -08:00
Nick Thomas 270155d655
Start tracking pool repositories 2018-11-05 01:40:29 +00:00
George Tsiolis 733ae94921 Fix typos in comments and specs 2018-11-01 08:59:20 +02:00
Nick Thomas fb48eaba46
Encrypt webhook tokens and URLs in the database 2018-10-01 15:33:36 +01:00
James Lopez 6e641789fc
Fix null pipeline problem 2018-09-24 11:23:47 +02:00
James Lopez 678ceb257e
use find instead of reject in avatar export file 2018-09-11 10:22:34 +02:00
James Lopez 994d91883b
fix avatar restorer 2018-09-11 08:59:14 +02:00
Douwe Maan 1f765ce9ea Merge branch '48778-remove-old-storage-logic-from-import-export' into 'master'
Resolve "Remove old storage logic from Import/Export"

Closes #51144, #50109, #48778, and #51079

See merge request gitlab-org/gitlab-ce!21409
2018-09-07 14:28:25 +00:00
Jan Provaznik d95c1f0335 Use ResourceLabelEvent for tracking label changes 2018-09-07 13:39:20 +00:00
James Lopez f1277fbf0b
refactor code based on feedback 2018-09-07 14:43:51 +02:00
James Lopez 27442862cf
refactor code based on feedback 2018-09-07 13:42:49 +02:00
James Lopez a2aa505805
Refactor code to remove object storage flag from Import/Export
Updated docs, refactor import/export code
Fix AvatarUploader path issue
Fix project export upload webhook error
2018-09-06 16:52:42 +02:00
Kamil Trzciński 19854160bc Fix import/export 2018-09-04 12:19:23 +02:00
Douwe Maan 472f2d5666 Merge branch '47765-group-visibility-error-due-to-string-conversion' into 'master'
Changes update_column to update_attributes in ProjectTreeRestorer#restore_project by using timeless to maintain the current timestamps

Closes #47765

See merge request gitlab-org/gitlab-ce!21242
2018-08-31 13:11:36 +00:00
José Iván Vargas López 27580720e1 Merge branch 'security-mk-exclude-orphaned-upload-files-from-export' into 'master'
[master] Resolve "Orphaned upload files are accessible via project exports"

Closes #2695

See merge request gitlab/gitlabhq!2453
2018-08-28 21:29:06 +00:00
Tiago Botelho 6dfab42236 Changes update_column to update_attributes in ProjectTreeRestorer#restore_project by using timeless to maintain the current timestamps 2018-08-28 15:29:31 +02:00
Yorick Peterse 9606dbbb03
Whitelist existing destroy_all offenses
This whitelists all existing places where we use "destroy_all".
2018-08-16 17:29:37 +02:00
Michael Kozono 029d5eeb9d Resolve "Orphaned upload files are accessible via project exports" 2018-08-14 11:33:02 -07:00
Mayra Cabrera 33311cb677 CE Port of Protected Environments backend 2018-08-10 13:45:14 +00:00
James Lopez 07009a1f48
Add Object Storage to GitLab project import
- Refactor uploads manager
- Refactor importer, update import spec
- Add more object storage specs
2018-08-02 11:50:19 +02:00
Zeger-Jan van de Weg 79a5d76801
Add repository languages for projects
Our friends at GitHub show the programming languages for a long time,
and inspired by that this commit means to create about the same
functionality.

Language detection is done through Linguist, as before, where the
difference is that we cache the result in the database. Also, Gitaly can
incrementaly scan a repository. This is done through a shell out, which
creates overhead of about 3s each run. For now this won't be improved.

Scans are triggered by pushed to the default branch, usually `master`.
However, one exception to this rule the charts page. If we're requesting
this expensive data anyway, we just cache it in the database.

Edge cases where there is no repository, or its empty are caught in the
Repository model. This makes use of Redis caching, which is probably
already loaded.

The added model is called RepositoryLanguage, which will make it harder
if/when GitLab supports multiple repositories per project. However, for
now I think this shouldn't be a concern. Also, Language could be
confused with the i18n languages and felt like the current name was
suiteable too.

Design of the Project#Show page is done with help from @dimitrieh. This
change is not visible to the end user unless detections are done.
2018-08-01 18:58:29 +02:00
Jacob Vosmaer (GitLab) 3f0e6d9205 More Gitaly cleanup: fetch_ref, allow disk access blocks 2018-07-27 08:43:19 +00:00
Jacob Vosmaer (GitLab) 4147a2dbbd Annotate Gitlab::Git::Repository#fetch_ref 2018-07-24 06:33:55 +00:00
Stan Hu 1025059d1f Rename WHITELISTED_FILENAMES => IGNORED_FILENAMES 2018-07-17 10:30:53 +02:00
Stan Hu eda8156e5c Fix symlink vulnerability in project import
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49133
2018-07-17 10:30:52 +02:00
Sean McGivern 01ad732f8d Merge branch '48745-project-exports-fail-when-uploads-have-been-migrated-to-object-storage' into 'master'
Resolve "Project exports fail when uploads have been migrated to object storage"

Closes #48745

See merge request gitlab-org/gitlab-ce!20484
2018-07-16 10:28:21 +00:00
James Lopez 97ce0607d5
refactor code based on feedback 2018-07-16 11:45:11 +02:00
James Lopez 07ec2c7bd0
use fileuploader dynamic path method in uploads manager and add spec 2018-07-13 16:13:13 +02:00
James Lopez 1263367c3f
fix typo in uploads manager 2018-07-13 15:49:40 +02:00
James Lopez 16756c20de
add small comment to download method in uploads manager 2018-07-13 15:44:02 +02:00
James Lopez dae0d809ea
refactor uploads manager 2018-07-13 15:41:24 +02:00
James Lopez 4223a6fe45
refactor uploads manager to grab uploads in batches 2018-07-12 11:08:19 +02:00
James Lopez 8ea2027f43
fix uploads restorer missing path 2018-07-12 08:46:24 +02:00
Mark Chao a63bce1a4b Resolve "Rename the `Master` role to `Maintainer`" Backend 2018-07-11 14:36:08 +00:00