Sean McGivern
218e1f0963
Match full file path in FileDetector
...
The basename appears to have been a holdover from the past - it doesn't look
necessary now. Some of the regexes were unanchored on one side, so explicitly
ensure that they only match the root.
Apart from that, this means that pushing to foo/README.md will no longer
invalidate the main README cache for a project.
2017-10-12 11:13:37 +01:00
Douwe Maan
a6d09bc652
Merge branch 'fix/pass-git-object-dir-attrs-as-relative' into 'master'
...
Pass git object dir attributes as relative paths to Gitaly
Closes gitaly#629
See merge request gitlab-org/gitlab-ce!14713
2017-10-11 15:55:49 +00:00
Shinya Maeda
a6b2387d3f
Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, instead of `Gcp::Cluster.count`
2017-10-11 23:02:47 +09:00
Ahmad Sherif
4378f56c7b
Pass git object dir attributes as relative paths to Gitaly
...
Fixes gitaly#629
2017-10-11 15:46:55 +02:00
Sean McGivern
565a2d7303
Merge branch '35580-cannot-import-project-with-milestones' into 'master'
...
fix the import :milestone from adding the group_id
Closes #35580
See merge request gitlab-org/gitlab-ce!14657
2017-10-11 10:46:05 +00:00
Rémy Coutable
143ace07ad
Merge branch 'gitaly-has-local-branches' into 'master'
...
Use Gitaly's RepositoryService.HasLocalBranches RPC
See merge request gitlab-org/gitlab-ce!14753
2017-10-11 10:05:22 +00:00
Bob Van Landuyt
2c6c2ed6fa
Always use the same order specs for `MultiCollectionPaginator`
2017-10-11 11:27:59 +02:00
Annabel Dunstone Gray
bd0248307d
Simplify project page
2017-10-11 09:07:19 +00:00
Alejandro Rodríguez
06e7eeb1c2
Use Gitaly's RepositoryService.HasLocalBranches RPC
2017-10-10 14:26:32 -03:00
Bob Van Landuyt
741fb49378
Merge branch 'master' into bvl-group-trees
2017-10-10 17:53:42 +02:00
Ahmad Sherif
03f3cee0c7
Fix a liniting error introduced by !14652
2017-10-10 14:58:31 +02:00
Robert Speicher
377c10b493
Merge branch 'feature/migrate-workhorse-send-git-diff-patch-to-gitaly' into 'master'
...
Migrate Workhorse Send{Diff,Patch} to Gitaly
See merge request gitlab-org/gitlab-ce!14652
2017-10-10 11:02:25 +00:00
Alejandro Rodríguez
1731934398
Add `Gitlab::Git::Repository#fetch` command
2017-10-09 18:25:24 -03:00
Rémy Coutable
f070265a6d
Introduce new hook data builders for Issue and MergeRequest
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-10-09 16:44:47 +02:00
Rémy Coutable
075d651604
Start adding Gitlab::HookData::IssuableBuilder
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-10-09 15:07:10 +02:00
Yorick Peterse
f277fa1409
Merge branch 'bvl-fork-network-migrations' into 'master'
...
Create fork networks for root projects that are deleted
Closes #38905
See merge request gitlab-org/gitlab-ce!14752
2017-10-09 12:33:35 +00:00
Rémy Coutable
781d2c22f4
Merge branch '37552-replace-js-true-with-js' into 'master'
...
Replaces `tag: true` into `:tag` in the specs
Closes #37552
See merge request gitlab-org/gitlab-ce!14653
2017-10-09 12:23:26 +00:00
Ahmad Sherif
618dd9e4b2
Migrate Workhorse Send{Diff,Patch} to Gitaly
2017-10-09 14:18:05 +02:00
Bob Van Landuyt
392e5df796
Don't create fork networks for root projects that are deleted
2017-10-09 08:44:23 +02:00
Michael Kozono
8c29a04549
Leave bad DNs alone instead of raising errors
2017-10-07 10:28:13 -07:00
Michael Kozono
1d1ad7e0b6
Refactor DN error classes
2017-10-07 10:28:13 -07:00
Michael Kozono
9ac732dda2
Add migration specs
2017-10-07 10:28:13 -07:00
Michael Kozono
6b9229466d
Normalize values, reusing DN normalization code
...
I first attempted to extract logic from the code that normalizes DNs, but I was unsuccessful. This is a hack but it works.
2017-10-07 10:28:13 -07:00
Michael Kozono
ed07faf284
Remove telephoneNumber format comment
...
Since that behavior changed, and is now under the malformed DN context.
2017-10-07 10:28:13 -07:00
Michael Kozono
689eea5a43
Fix space stripping
...
Especially from the last attribute value.
2017-10-07 10:28:13 -07:00
Michael Kozono
714f264d62
Rename method to `to_normalized_s`
2017-10-07 10:28:13 -07:00
Michael Kozono
b3d61832c3
Move downcasing to normalize method
2017-10-07 10:28:13 -07:00
Michael Kozono
14ed20d68a
Resolve Rubocop offenses
...
Disabling some for now since this is based on `Net::LDAP::DN`.
2017-10-07 10:28:13 -07:00
Michael Kozono
45ab20dca9
Switch to new DN class
...
for normalizing and parsing DNs
2017-10-07 10:28:13 -07:00
Michael Kozono
fe46c11de8
Fix newline tests
2017-10-07 10:28:13 -07:00
Michael Kozono
26054114be
Fix trailing escaped newline
2017-10-07 10:28:13 -07:00
Michael Kozono
1480cf84d8
Add valid DN tests using OIDs
2017-10-07 10:28:13 -07:00
Michael Kozono
66030b03dd
Test malformed DNs
2017-10-07 10:28:13 -07:00
Michael Kozono
8bd59f3aeb
Raise UnsupportedDnFormatError on multivalued RDNs
2017-10-07 10:28:13 -07:00
Michael Kozono
47dff608f4
Allow unescaped, non-reserved Unicode characters
2017-10-07 10:28:13 -07:00
Michael Kozono
f610fea777
Handle CR and LF characters
2017-10-07 10:28:13 -07:00
Michael Kozono
1e7ff892c0
Fix escaped hex comma test
2017-10-07 10:28:13 -07:00
Michael Kozono
f9283b8b18
Reword escaped comma test
2017-10-07 10:28:12 -07:00
Michael Kozono
c79879f33a
Fix escaped equal signs
2017-10-07 10:28:12 -07:00
Michael Kozono
e65bf3fa63
Clarify test
2017-10-07 10:28:12 -07:00
Michael Kozono
cb591f86e4
Fix to_s_normalize for escaped leading space
2017-10-07 10:28:12 -07:00
Michael Kozono
91f2492a78
Add `DN#to_s_normalized`
2017-10-07 10:28:12 -07:00
Michael Kozono
aefc96ca27
Rely on LDAP providers giving DNs, not UIDs
2017-10-07 10:28:12 -07:00
Michael Kozono
010cd3dea8
Rescue DN normalization attempts
2017-10-07 10:28:12 -07:00
Michael Kozono
79b5cbded7
Note invalid DNs
2017-10-07 10:28:12 -07:00
Michael Kozono
ca5ade22f3
Fix `dn?` for a UID with an escaped equal sign
2017-10-07 10:28:12 -07:00
Michael Kozono
fee3c95d75
Remove redundant `is_`
2017-10-07 10:28:12 -07:00
Michael Kozono
3e83ba34d1
Dry up spec some more
...
…to stop copy pasting test cases.
2017-10-07 10:28:12 -07:00
Michael Kozono
a3ec58dacf
Downcase normalized LDAP DNs and UIDs
2017-10-07 10:28:12 -07:00
Michael Kozono
4ae32d9577
Fix normalize behavior for escaped delimiter chars
2017-10-07 10:28:12 -07:00
Michael Kozono
f1773640bf
Refactor spec
2017-10-07 10:28:12 -07:00
Michael Kozono
abe570cd0b
Refactor to distinguish between UIDs and DNs
2017-10-07 10:28:12 -07:00
Michael Kozono
42bc6caee0
Trim extraneous spaces from DNs
2017-10-07 10:28:12 -07:00
Jacopo
0ce6785851
Replaces `tag: true` into `:tag` in the specs
...
Replaces all the explicit include metadata syntax in the specs (tag:
true) into the implicit one (:tag).
Added a cop to prevent future errors and handle autocorrection.
2017-10-07 13:57:54 +02:00
Douwe Maan
546b18b903
Merge branch 'tc-geo-read-only-idea' into 'master'
...
Create idea of read-only database
Closes #37534
See merge request gitlab-org/gitlab-ce!14688
2017-10-07 11:01:21 +00:00
Bob Van Landuyt
df7f530d84
Add a migration to populate fork networks
...
This uses the existing ForkedProjectLinks
2017-10-07 11:46:23 +02:00
Bob Van Landuyt
e8ca579d88
Add a project forks spec helper
...
The helper creates a fork of a project with all provided attributes,
but skipping the creation of the repository on disk.
2017-10-07 11:46:23 +02:00
Bob Van Landuyt
20727db170
Add a model for `fork_networks`
...
The fork network will keep track of the root project as long as it's
present.
2017-10-07 11:46:22 +02:00
Kamil Trzciński
5ee20b6375
Merge branch 'master' into '37970-ci-sections-tracking'
...
# Conflicts:
# db/schema.rb
2017-10-07 08:07:33 +00:00
Felipe Artur
b54203f0ad
Commenting on image diffs
2017-10-07 04:25:17 +00:00
Toon Claes
d13669716a
Create idea of read-only database
...
In GitLab EE, a GitLab instance can be read-only (e.g. when it's a Geo
secondary node). But in GitLab CE it also might be useful to have the
"read-only" idea around. So port it back to GitLab CE.
Also having the principle of read-only in GitLab CE would hopefully
lead to less errors introduced, doing write operations when there
aren't allowed for read-only calls.
Closes gitlab-org/gitlab-ce#37534 .
2017-10-06 22:37:40 +02:00
Kamil Trzciński
fb70fadaca
Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' into 'master'
...
Create Kubernetes cluster on GKE from k8s service
Closes #35954
See merge request gitlab-org/gitlab-ce!14470
2017-10-06 17:06:55 +00:00
Sean McGivern
a68a39e341
Merge branch '18608-lock-issues-v2' into 'master'
...
Resolve "Lock issue and merge request"
Closes #18608
See merge request gitlab-org/gitlab-ce!14531
2017-10-06 16:47:27 +00:00
Shinya Maeda
830c770a53
Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
2017-10-07 00:27:15 +09:00
Sean McGivern
f55f24c497
Merge branch 'valid-branch-name-dash-bug' into 'master'
...
Prevent branches or tags from starting with invalid characters (e.g. -, .)
Closes #38817
See merge request gitlab-org/gitlab-ce!14710
2017-10-06 13:40:17 +00:00
Douwe Maan
dd42cb5f8f
Merge branch '36829-gpg-commit-not-verified-if-signed-with-a-subkey' into 'master'
...
Add support for GPG subkeys in signature verification
Closes #36829
See merge request gitlab-org/gitlab-ce!14517
2017-10-06 13:36:20 +00:00
micael.bergeron
de025ad2db
fixing group label import
2017-10-06 09:11:29 -04:00
Shinya Maeda
91e530df24
Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
2017-10-06 21:29:03 +09:00
micael.bergeron
a0b8275da5
adding the new spec file
2017-10-06 08:11:09 -04:00
Grzegorz Bizon
6cd7ce3324
Merge branch 'backstage/gb/move-some-pipelines-code-from-ee-to-ee' into 'master'
...
Move to CE some EE pipelines-related code that belongs to CE
Closes gitlab-ee#3616
See merge request gitlab-org/gitlab-ce!14699
2017-10-06 10:08:00 +00:00
Rubén Dávila
555f50b3e6
Add more specs.
2017-10-05 22:43:44 -05:00
Jacob Schatz
351fde1b90
Prevent branches or tags from starting with invalid characters (e.g. -, .)
...
Closes #38817
2017-10-05 14:56:36 -07:00
micael.bergeron
a8d9dbc1a6
fix the project import when an issue has a group milestone
2017-10-05 12:05:55 -04:00
Alessio Caiazza
91f8e734fe
Add CI build trace sections extractor
2017-10-05 15:42:25 +02:00
Rubén Dávila
866ef2bb2e
Add more specs to cover subkeys scenarios
2017-10-05 08:25:27 -05:00
Zeger-Jan van de Weg
4656283c5c
Gitaly namespace service enabled for GitLab
2017-10-05 14:11:32 +02:00
Shinya Maeda
b229637b08
fetch_kubernetes_token_service_spec. Fix static analysys.
2017-10-05 20:26:07 +09:00
Grzegorz Bizon
663f3240a9
Make it possible to export pipeline failure reason
2017-10-05 11:41:54 +02:00
Grzegorz Bizon
9f639b0733
Set a pipeline failure reason when it has YAML errors
...
Conflicts:
app/models/ci/pipeline.rb
2017-10-05 11:38:01 +02:00
Grzegorz Bizon
1ca4f282a4
Add specs for methods that count pipeline seeds size
2017-10-05 11:28:39 +02:00
Bob Van Landuyt
dda023d66d
Optimize queries and pagination in `GroupDescendantsFinder`
2017-10-05 11:10:57 +02:00
Shinya Maeda
88cc9d5294
Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
2017-10-05 14:49:16 +09:00
Bob Van Landuyt
06e00913f5
Move merging of Hashes out of the `GroupDescendant` concern
...
Since it can technically merge any hash with objects that respond to `==`
2017-10-04 22:49:42 +02:00
Bob Van Landuyt
08383fd2e3
Make it possible to limit ancestors in a `GroupHierarchy`
...
Passing a parent_id will limit ancestors upto the specified parent if
it is found.
Using `ancestors` and `descendants` the `base` relation will not be included
2017-10-04 22:49:42 +02:00
Bob Van Landuyt
530cf2a266
Don't break when building unions on empty collections
2017-10-04 22:49:41 +02:00
Bob Van Landuyt
80780018a9
Update `children` route to handle projects and groups
2017-10-04 22:46:49 +02:00
micael.bergeron
09a733bac3
fix the spec so it fails before applying the fix
2017-10-04 09:12:01 -04:00
Sean McGivern
27e18f182f
Merge branch 'gitaly-fetch-ref' into 'master'
...
Let fetch_ref pull from Gitaly instead of from disk
Closes gitaly#585
See merge request gitlab-org/gitlab-ce!14588
2017-10-04 12:07:17 +00:00
Sean McGivern
b1050bfe39
Merge branch 'merge-request-notes-performance' into 'master'
...
Use a UNION ALL for getting merge request notes
Closes #38508
See merge request gitlab-org/gitlab-ce!14620
2017-10-04 12:03:32 +00:00
Shinya Maeda
8cff79bc1d
Fix static analysys. Fix import config.
2017-10-04 20:27:25 +09:00
Jacob Vosmaer
147e2b21be
Let fetch_ref pull from Gitaly instead of from disk
2017-10-04 12:57:41 +02:00
Shinya Maeda
982c2b83ed
Fix static anlysys. Added safe_model_attributes.
2017-10-04 18:21:01 +09:00
Shinya Maeda
f4f9ee9405
Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
2017-10-04 16:47:21 +09:00
Douwe Maan
c6e5a77e51
Merge branch 'gitaly-delete-branch' into 'master'
...
Implement OperationService.UserDeleteBranch Gitaly RPC
See merge request gitlab-org/gitlab-ce!14603
2017-10-04 07:34:33 +00:00
Shinya Maeda
20abcbffae
Add google_api to TOP_LEVEL_ROUTES. Import/Export model failure fix. Fix static analysys.
2017-10-04 16:04:45 +09:00
Alejandro Rodríguez
79719cf003
Add OperationService.UserDeleteBranch Gitaly RPC
2017-10-03 21:06:34 -03:00
Kamil Trzciński
da9d42f2b3
Merge branch '37970-timestamped-ci' into 'master'
...
Hide CI section markers from job trace
See merge request gitlab-org/gitlab-ce!14393
2017-10-03 18:16:54 +00:00
Jacob Vosmaer (GitLab)
bfd53aa6d0
Restore User.from_gitaly
2017-10-03 16:53:11 +00:00
Lin Jen-Shin
0a6925c1f5
Remove those tests as they're not needed anymore
...
Because now addressable would consider them invalid anyway.
2017-10-03 23:06:55 +08:00
Lin Jen-Shin
9e42df3cd1
Merge remote-tracking branch 'upstream/master' into gem/sm/bump-google-api-client-gem-from-0-8-6-to-0-13-6
...
* upstream/master: (186 commits)
Resolve "Precompiled assets with digest strings are ignored in CI"
Fix navigation dropdown close animation on mobile screens
Add (partial) index on Labels.template
Add grpc.log for Gitaly
Fix gitaly-proto version in Gemfile.lock
refactor issues_controller_spec `update` action
Remove edit action for issues
Add documentation to summarise project archiving
Fix for Gitaly nil encoding issue
Fix broken certificate-authority-data with kubectl >= 1.8.0
Improve performance of filtering notes in NotesController
Bump gitaly-proto version to v0.39.0
Fix specs for project creation and update services
Add CHANGELOG
Doesn't check if path exists on disk when renaming a hashed project
[ci skip] Fix archive spec descrptions
Only copy old/new code when selecting left/right side of parallel diff
Fix gitlab-rake gitlab:import:repos task
Send extra Gitaly params for `send_git_archive` if needed
Update GitLab Pages to v0.6.0
...
2017-10-03 23:03:36 +08:00
Mike Greiling
7b262c4356
Resolve "Precompiled assets with digest strings are ignored in CI"
2017-10-03 14:47:56 +00:00
Alessio Caiazza
5709408585
Hide CI section markers from job trace
2017-10-03 11:35:23 +02:00
Sean McGivern
4582fff662
Merge branch 'close-issue-by-implements' into 'master'
...
Add "implements" to the default issue closing message regex
Closes #38424
See merge request gitlab-org/gitlab-ce!14612
2017-10-03 08:27:54 +00:00
Sean McGivern
0ac06c89e9
Merge branch 'ff_port_from_ee' into 'master'
...
Move Fast-Forward Merge to CE
See merge request gitlab-org/gitlab-ce!14272
2017-10-03 08:24:31 +00:00
Andrew Newdigate
27cc1c2b28
Fix for Gitaly nil encoding issue
2017-10-03 08:03:19 +00:00
Jarka Kadlecova
c488bcd13e
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issues-v2
...
# Conflicts:
# db/schema.rb
2017-10-03 09:37:48 +02:00
Alejandro Rodríguez
40060b18c7
[ci skip] Fix archive spec descrptions
2017-10-02 15:33:31 -03:00
Alejandro Rodríguez
fce708c154
Send extra Gitaly params for `send_git_archive` if needed
2017-10-02 12:39:42 -03:00
Douwe Maan
b40192a946
Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master'
...
Attempt to link saml users to ldap by email
Closes #33493
See merge request gitlab-org/gitlab-ce!14216
2017-10-02 15:24:48 +00:00
Douwe Maan
4716e81f9d
Merge branch 'revert-configurable-size-limits' into 'master'
...
Revert "Increase diff limits to 100 KB for collapse and 200 KB overall"
See merge request gitlab-org/gitlab-ce!14628
2017-10-02 14:39:55 +00:00
Yorick Peterse
c16b99a49c
Use a UNION ALL for getting merge request notes
...
In this particular case the use of UNION ALL leads to a better query
plan compared to using 1 big query that uses an OR statement to combine
different data sources.
See https://gitlab.com/gitlab-org/gitlab-ce/issues/38508 for more
information.
2017-10-02 15:31:59 +02:00
Sean McGivern
a5d47bb063
Revert "Increase diff limits to 100 KB for collapse and 200 KB overall"
...
This reverts commit 1d3c33b57e .
2017-10-02 13:54:40 +01:00
Guilherme Vieira
4e4a29ad75
Add "implements" to the default issue closing message regex
2017-10-02 12:02:38 +00:00
Tiago Botelho
011c168bff
Refactors SAML identity creation in gl_user.
2017-10-02 11:35:09 +01:00
Valery Sizov
a0ac2d932c
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_ee
2017-10-02 13:15:46 +03:00
Valery Sizov
284185a356
Add merge_requests_rebase_enabled to json entities for specs
2017-10-02 12:54:28 +03:00
Jacob Vosmaer
972c5e8900
Fix 'gitlay' typo in spec
2017-10-02 11:37:26 +02:00
Sean McGivern
0a69abdb28
Merge branch 'gitaly-add-branch' into 'master'
...
Implement OperationService.UserAddBranch Gitaly RPC
Closes gitaly#544
See merge request gitlab-org/gitlab-ce!14522
2017-10-02 09:27:23 +00:00
Alejandro Rodríguez
fa5f0164eb
Implement OperationService.UserAddBranch Gitaly RPC
2017-09-30 00:58:56 -03:00
Alejandro Rodríguez
16f850033f
Populate `Gitlay::Repository`'s `gl_repository` field
2017-09-30 00:58:56 -03:00
Alejandro Rodríguez
a97ff8aae0
Add a factory for `Gitaly::GitCommit`s
2017-09-30 00:51:16 -03:00
David Turner
dbcf48af8b
Add username as GL_USERNAME in hooks (http)
...
When calling pre-receive, post-receive, and update hooks, add the GitLab
username as the GL_USERNAME environment variable.
This patch only handles cases where pushes are over http, or via
the web interface. Later, we will address the ssh case.
2017-09-29 18:12:03 -04:00
Jacob Vosmaer
e5fecc3a37
Create repositories via Gitaly
2017-09-29 18:27:06 +02:00
Lin Jen-Shin
9401c137fd
Just allow the scheme we want!
2017-09-29 21:45:00 +08:00
Rémy Coutable
05e9c9f77e
Merge branch '36631-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master'
...
Insert at most 1,000 rows at once in MR diff background migration
Closes #36631 et #37505
See merge request gitlab-org/gitlab-ce!13661
2017-09-29 13:43:28 +00:00
Jacob Vosmaer (GitLab)
403712f06e
Make Repository#has_visible_content more efficient
2017-09-29 13:08:44 +00:00
Lin Jen-Shin
f7fd36f2a2
Adapt to the latest addressable behaviour
2017-09-29 20:42:27 +08:00
Sean McGivern
1507ff8ab7
Make MR diff background migration less likely to time out
...
This version does not use transactions, but individual statements. As we have
unique constraints on the target tables for the inserts, we can just ignore
uniqueness violations there (as long as we always insert the same batch size, in
the same order).
This means the spec now must use truncation, not a transaction, as the
uniqueness violation means that the whole transaction for that spec would be
invalid, which isn't what we'd want. In real-world use, this isn't run in a
transaction anyway.
This commit also wraps unhandled exceptions, for easier finding in Sentry, and
logs with a consistent format, for easier searching.
2017-09-29 11:56:08 +01:00
Sean McGivern
917194153f
Insert at most 1,000 rows at once in MR diff background migration
...
We were hitting the statement timeout for very large MR diffs. Now we insert at
most 1,000 rows to `merge_request_diff_commits` in a single statement, or 100
rows to `merge_request_diff_files`.
2017-09-29 11:00:19 +01:00
Robert Speicher
07c3112ef5
Merge branch 'feature/migrate-repository-rm-tag-to-gitaly' into 'master'
...
Migrate Git::Repository#rm_tag to Gitaly
Closes gitaly#562
See merge request gitlab-org/gitlab-ce!14388
2017-09-28 22:43:37 +00:00
Eric Eastwood
3468ca835d
Merge branch 'master' into ff_port_from_ee
...
Conflicts:
app/models/project.rb
db/schema.rb
2017-09-28 16:59:49 -05:00
Ahmad Sherif
3944e16b4b
Migrate Git::Repository#rm_tag to Gitaly
...
Closes gitaly#562
2017-09-28 23:36:40 +02:00
Douwe Maan
ae03a52f09
Merge branch 'hashed-storage-migration-path' into 'master'
...
Hashed storage migration path
Closes gitlab-ee#3118
See merge request gitlab-org/gitlab-ce!14067
2017-09-28 17:26:16 +00:00
Gabriel Mazetto
38607b48b6
[Backported from EE] Readonly flag for Projects
...
This is used in EE for the storage migration, and we want to use this
in CE as well to be able to migrate projects to hashed_storage.
2017-09-28 13:20:11 +01:00
Sean McGivern
b63e8d64c1
Handle error when fetching ref for MR with deleted source branch
...
If the ref doesn't exist, and the source branch is deleted, we can't get it back
easily. Previously, we ignored this error by shelling out, so replicate that
behaviour.
2017-09-28 11:11:10 +01:00
Kamil Trzciński
0bba522f74
Merge branch 'backstage/gb/refactor-pipeline-create-service' into 'master'
...
Refactor a service responsible for creating a pipeline
Closes #37563 and #34415
See merge request gitlab-org/gitlab-ce!14482
2017-09-27 14:44:28 +00:00
Eric Eastwood
6f9a6d37a9
Merge branch 'master' into ff_port_from_ee
2017-09-26 16:24:54 -05:00
Robert Speicher
d0606b5ff4
Merge branch 'dm-bitbucket-import-truncated-shas' into 'master'
...
Fix bug that caused merge requests with diff notes imported from Bitbucket to raise errors
Closes #38100
See merge request gitlab-org/gitlab-ce!14438
2017-09-26 14:16:46 +00:00
Grzegorz Bizon
835bdcb88e
Add specs for pipeline chain builder sequence class
2017-09-26 14:24:40 +02:00
Grzegorz Bizon
f6bd832f3f
Fix some code style offenses in pipeline chain classes
2017-09-26 14:15:05 +02:00
Grzegorz Bizon
53cad50043
Add missing tests for pipeline chain access validator
2017-09-26 14:13:08 +02:00
Grzegorz Bizon
6a9cfdde02
Add specs for pipeline builder that validates config
2017-09-26 14:04:28 +02:00
Grzegorz Bizon
39f05fd85e
Add specs for pipeline builder repository validator
2017-09-26 13:40:37 +02:00
Grzegorz Bizon
652ecff91b
Add specs for builder chain that persist a pipeline
2017-09-26 13:34:53 +02:00
Grzegorz Bizon
2432d5bd9e
Add specs for builder chain step that skipps pipelines
2017-09-26 13:22:28 +02:00
Grzegorz Bizon
da15b38850
Add specs for pipeline builder abilities validator
2017-09-26 13:00:29 +02:00
Grzegorz Bizon
fa3fb23fb1
Move pipeline builder validation chain to a module
2017-09-26 11:53:50 +02:00
Grzegorz Bizon
609fa45f0e
Split pipeline chain builder validation class
2017-09-26 11:50:47 +02:00
Jarka Kadlecova
142bbd900b
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issues
...
# Conflicts:
# app/assets/javascripts/notes/components/issue_comment_form.vue
2017-09-25 18:48:58 +02:00
Douwe Maan
c19030332c
Add specs
2017-09-25 16:56:14 +02:00