Commit Graph

2416 Commits

Author SHA1 Message Date
Jacob Vosmaer 8a62f304ef Add a UTF-8 encoding matcher 2017-06-30 14:32:42 +02:00
Jacob Vosmaer 7648f11381 Remove unnecessary contexts 2017-06-30 14:32:42 +02:00
Alejandro Rodríguez f4e6aba1bb Set the GL_REPOSITORY env variable on Gitlab::Git::Hook 2017-06-29 15:22:40 -04:00
Sean McGivern 31c21d50fc Merge branch 'sha-attributes-for-postgresql-and-mysql' into 'master'
Added code for defining SHA attributes

See merge request !12555
2017-06-29 15:20:47 +00:00
Kamil Trzciński efb7b2d341 Merge branch 'zj-usage-ping-only-gl-pipelines' into 'master'
Only count GL pipelines in usage data ping

Closes #33172

See merge request !12277
2017-06-29 13:55:19 +00:00
Yorick Peterse af1f6844c9
Added code for defining SHA attributes
These attributes are stored in binary in the database, but exposed as
strings. This allows one to query/create data using plain SHA1 hashes as
Strings, while storing them more efficiently as binary.
2017-06-29 15:37:37 +02:00
Rémy Coutable 572fa2cb02 Merge branch '34280-gitalyclient-sort_by_param-invalid-sort_by-key-recently_updated' into 'master'
Fix a bug where an invalid sort param value was passed to Gitaly

Closes #34280

See merge request !12534
2017-06-29 12:53:55 +00:00
Sean McGivern 971604de4c Merge branch 'bvl-rename-all-reserved-paths' into 'master'
Rename all forbidden paths again

Closes #32625

See merge request !11713
2017-06-29 11:50:22 +00:00
Alejandro Rodríguez 5681bf6349 Fix a bug where an invalid sort param value was passed to Gitaly 2017-06-28 15:38:00 -04:00
Robert Speicher 9f44687a14 Merge branch 'gitaly-encodings' into 'master'
Fix gitaly ref encoding bugs

Closes #34156

See merge request !12522
2017-06-28 18:45:54 +00:00
Robert Speicher 9ef6d028a1 Merge branch 'dm-dependency-linker-newlines' into 'master'
Fix diff of requirements.txt file by not matching newlines as part of package names

Closes #34321

See merge request !12495
2017-06-28 15:24:01 +00:00
Douwe Maan 4970a66b24 Merge branch 'bvl-fix-ldap-login' into 'master'
Fix setting `last_credential_check_at` on LDAP-login

See merge request !12507
2017-06-28 14:59:43 +00:00
Jacob Vosmaer d3bcf8ac2a Fix gitaly ref encoding bugs 2017-06-28 16:15:59 +02:00
Sean McGivern 5dd6d9a9ec Merge branch 'submodules-private' into 'master'
Make Gitlab::Git::Repository#submodules private

See merge request !12479
2017-06-28 09:25:45 +00:00
Bob Van Landuyt d2eb5bbd9c Fix setting `last_credential_check` on LDAP-login 2017-06-28 09:30:18 +02:00
Douwe Maan 34f7c3bd1a Fix diff of requirements.txt file by not matching newlines as part of package names 2017-06-27 16:20:01 -05:00
Sean McGivern 6ab588665c Merge branch 'gitlab-git-find-commits' into 'master'
Clean up Gitlab::Git::Commit.find_all

See merge request !12476
2017-06-27 15:49:12 +00:00
Jacob Vosmaer cf131bf713 Make Gitlab::Ggit::Repository#submodules private 2017-06-27 16:03:35 +02:00
Bob Van Landuyt 7c53fcf11f Adjust for new static-analysis failures 2017-06-27 13:05:02 +02:00
Grzegorz Bizon c00e5bfa06 Merge branch 'zj-review-apps-usage-data' into 'master'
Add review apps to usage ping

Closes #33171

See merge request !12185
2017-06-27 10:53:12 +00:00
Z.J. van de Weg 4447006832 Split pipelines by origin on usage data
When sending the usage data, it now includes all pipelines. This commit
will split the pipelines in two; internal and external.

This will lead to historical data being incorrectly marked this way.

Fixes gitlab-org/gitlab-ce#33172
2017-06-27 12:47:44 +02:00
Rémy Coutable f4eef75d69 Merge branch '34324-gitlab-db-seed-is-broken' into 'master'
Resolve "GitLab DB seed is broken"

Closes #34324

See merge request !12464
2017-06-27 10:41:05 +00:00
Jacob Vosmaer 43c3a65062 Remove 'contains' option from Commit.find_all 2017-06-27 12:38:58 +02:00
Jacob Vosmaer 144e37c667 Remove Gitlab::Git::Repository#find_all 2017-06-27 12:30:51 +02:00
Sean McGivern eacce60b17 Merge branch '34052-store-mr-ref-fetched-in-database' into 'master'
Store merge request ref_fetched status in the database

Closes #34052

See merge request !12424
2017-06-27 09:38:58 +00:00
Z.J. van de Weg e7d12a70d2 Add in_review_folder to usage ping
As its hard to reliably check how many review apps there are on the
clients machine, we start by checking where the type is `review`. This
means the folder is called that way. This will lead to a seq
scan on the table. However, this is done once a week, so the benefit of
adding an index seems not to apply here.
2017-06-27 09:39:05 +02:00
Sean McGivern d4a3474b9b Fix Gitlab::Database.bulk_insert for non-UTF-8 data 2017-06-26 17:21:40 +01:00
Bob Van Landuyt 171f2d97dc Keep failed renames in redis 2017-06-26 17:49:30 +02:00
Bob Van Landuyt d6a0c288c8 Use the migration name as a key in redis 2017-06-26 17:49:30 +02:00
Bob Van Landuyt 229ac39a4c Don't break rolling back when a namespace or project was renamed 2017-06-26 17:49:30 +02:00
Bob Van Landuyt c98ed42d01 Revert renames from a migration 2017-06-26 17:49:30 +02:00
Bob Van Landuyt 152cba56e4 Revert namespace renames 2017-06-26 17:49:30 +02:00
Bob Van Landuyt 0faff42d7c Add methods to revert project renames 2017-06-26 17:49:30 +02:00
Bob Van Landuyt 3e84b6336f Track all renames in redis 2017-06-26 17:48:41 +02:00
Adam Niedzielski 0eb3d18c56 Store merge request ref_fetched status in the database
Closes #34052
2017-06-26 17:36:09 +02:00
Gabriel Mazetto 43c3fa4455 Introduce #renew for ExclusiveLease 2017-06-24 03:40:58 +02:00
Grzegorz Bizon 2511c19f8f Merge branch 'dm-requirements-txt-tilde' into 'master'
Don't match tilde and exclamation mark as part of requirements.txt package name

Closes #34166

See merge request !12431
2017-06-23 21:17:21 +00:00
Douwe Maan c00f81d8a6 Merge branch 'tc-refactor-projects-finder-init-collection' into 'master'
Add User#full_private_access? to check if user has access to all private groups & projects

Closes #31745

See merge request !12373
2017-06-23 20:50:52 +00:00
Douwe Maan 11e22835ed Don't match tilde and exclamation mark as part of requirements.txt package name 2017-06-23 13:07:32 -05:00
Yorick Peterse a4c81b6416 Merge branch 'fix/gb/improve-updating-column-in-batches-helper' into 'master'
Improve `update_column_in_batches` migration helper

Closes #34064

See merge request !12350
2017-06-23 15:30:29 +00:00
Toon Claes b90f1098cf Add User#full_private_access? to check if user has Private access
In CE only the admin has access to all private groups & projects. In EE also an
auditor can have full private access.

To overcome merge conflicts, or accidental incorrect access rights, abstract
this out in `User#full_private_access?`.

`User#admin?` now only should be used for admin-only features. For private
access-related features `User#full_private_access?` should be used.

Backported from gitlab-org/gitlab-ee!2199
2017-06-23 11:15:35 +02:00
Robert Speicher 826d5b7b51 Merge branch 'fix/properly-encode-gitaly-diffs' into 'master'
Encode Gitaly diff patches properly

See merge request !12368
2017-06-22 16:50:30 +00:00
Pawel Chojnacki 97c42df3b8 Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch 2017-06-22 15:05:52 +02:00
Grzegorz Bizon 019b4d3465 Fix Rubocop offense in migration helpers specs 2017-06-22 13:55:35 +02:00
Grzegorz Bizon 5331a49d0b Merge branch 'master' into fix/gb/improve-updating-column-in-batches-helper
* master: (56 commits)
  File view buttons
  Don't reset the session when the example failed, because we need capybara-screenshot to have access to it
  Resolve "MR comment + system note highlight don't have the same width"
  Add feature spec for dashboard state filter tabs
  Wording of Mysql support.
  a new feature checklist and more elaborate documentation requirements
  Filter archived project in API v3 only if param present
  Revert to using links instead of buttons in Issuable Index tabs.
  Do not run the codeclimate job on docs-only changes
  Only show gray footer space if environment actions exist
  Migrate Gitlab::Git::Blob.find to Gitaly
  Backport filtered search lazy token consistent state fix
  Add a comment explaining how the branch clean up happens
  Fix Github::Representation::PullRequest#source_branch_exists?
  Add CHANGELOG
  Fix GitHub importer performance on branch existence check
  Rebuild the dynamic path before validating it
  Rename stage ref migration specs to match a class name
  Enable Style/DotPosition Rubocop 👮
  Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"
  ...

Conflicts:
	db/post_migrate/20170526185921_migrate_build_stage_reference.rb
2017-06-22 12:37:38 +02:00
Grzegorz Bizon 3a3dd53920 Disable transaction in specs for some migrations 2017-06-22 12:35:47 +02:00
Grzegorz Bizon 3447f97b44 Fix specs for database migration helpers with transactions 2017-06-22 12:34:16 +02:00
Ahmad Sherif 5b092d21cc Encode Gitaly diff patches properly 2017-06-22 03:12:23 +02:00
Robert Speicher f85d0a0024 Merge branch 'feature/migrate-blob-find-to-gitaly' into 'master'
Migrate Gitlab::Git::Blob.find to Gitaly

See merge request !12104
2017-06-22 01:00:30 +00:00
Ahmad Sherif 0284f01716 Migrate Gitlab::Git::Blob.find to Gitaly 2017-06-21 17:31:20 +02:00