root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
63,245 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

3973 Commits

Author SHA1 Message Date
Bob Van Landuyt 18907efbc9 Pass `archived:` as a keyword argument 2017-10-12 11:36:54 +02:00
Oswaldo Ferreira 9ab0254085 Make "merge ongoing" check more consistent 2017-10-11 18:48:39 +02: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
Bob Van Landuyt bd8943f5ad Fix spinach features 
And several other failures
 2017-10-11 14:16:40 +02:00
Bob Van Landuyt 5a903149e7 Handle archived projects in the `GroupDescendantsFinder` 2017-10-11 10:17:24 +02:00
Bob Van Landuyt 741fb49378 Merge branch 'master' into bvl-group-trees 2017-10-10 17:53:42 +02:00
Bob Van Landuyt 9d1348d668 Move the `ancestors_upto` to `Project` and `Namespace` 2017-10-10 16:55:02 +02:00
Douwe Maan 36ae3bf1ca Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master' 
Resolve "Private Avatars are not CDN compatible"

Closes #38245 and gitlab-com/support-forum#2476

See merge request gitlab-org/gitlab-ce!14443
 2017-10-10 12:48:19 +00:00
Douwe Maan bc7c6dde9a Merge branch '34284-add-changes-to-issuable-webhook-data' into 'master' 
Include the changes in issuable webhook payloads

Closes #34284

See merge request gitlab-org/gitlab-ce!14308
 2017-10-09 15:56:42 +00:00
Tim Zallmann 59c6ddcdef Fix for Lint Error + Upload Test 2017-10-09 17:05:51 +02: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
Rémy Coutable 67d5ca9f92 Include the changes in issuable webhook payloads 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-10-09 15:07:10 +02:00
Rémy Coutable 3acbbb1ad9
Don't show an "Unsubscribe" link in snippet comment notifications 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-10-09 15:03:05 +02: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
Robert Speicher 1fd0668bce Merge branch 'sh-show-all-slack-names' into 'master' 
Include GitLab full name with username in Slack messages

Closes #38865

See merge request gitlab-org/gitlab-ce!14740
 2017-10-09 08:52:20 +00:00
Rubén Dávila 4aa2deb478 Fix error with GPG signature updater when commit was deleted 2017-10-07 10:47:53 -05: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 f90b27da77 Find forks within users/namespaces using fork memberships 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 70716a1292 Allow creating merge requests across forks of a project 2017-10-07 11:46:23 +02:00
Bob Van Landuyt d328007214 Create a fork network when forking a project 
When no fork network exists for the source projects, we create a new
one with the correct source
 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
Winnie Hellmann 265b1a3b72 Show confirmation modal before deleting account 2017-10-06 20:40:41 +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
Stan Hu 7500097970 Include GitLab full name with username in Slack messages 
We used to include the first and last name of the user, but !6624 modified
this to include only the username. Let's compromise and add both in the form
of `First Last (username)`.

Closes #38865
 2017-10-06 13:02:28 -07: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
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
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
Alessio Caiazza c0cfc9ebd2
Extract `Ci::Build#parse_trace_sections!` into a service 2017-10-06 12:33:10 +02: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
Nick Thomas ce87f42dc9 Merge branch '34102-online-view-of-artifacts-fe' into 'master' 
Add external link for online artifacts

Closes #34102

See merge request gitlab-org/gitlab-ce!14399
 2017-10-05 15:03:17 +00:00
Douwe Maan cd60a02ad9 Merge branch 'zj-gitaly-namespace-service' into 'master' 
Gitaly namespace service enabled for GitLab

See merge request gitlab-org/gitlab-ce!14274
 2017-10-05 15:01:52 +00:00
Alessio Caiazza 91f8e734fe
Add CI build trace sections extractor 2017-10-05 15:42:25 +02:00
Rubén Dávila dd139e65b5 Invalidate GpgSignatures associated to GpgKeySubkeys when revoking the GpgKey 2017-10-05 08:26:02 -05:00
Rubén Dávila 866ef2bb2e Add more specs to cover subkeys scenarios 2017-10-05 08:25:27 -05:00
Rubén Dávila b27549df97 Add some basic specs and refactor model and validations 2017-10-05 08:25:27 -05:00
Zeger-Jan van de Weg d1dd115356
Update test to use the new API 2017-10-05 15:14:44 +02:00
Zeger-Jan van de Weg f879c58706
Fix namespace deletion tests 2017-10-05 15:01:26 +02:00
Kamil Trzcinski aba71835f3 Merge remote-tracking branch 'origin/master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service 2017-10-05 14:27:42 +02: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
Bob Van Landuyt b3acd5459c Use `alias_attribute` & `alias_method` to define parent-methods 2017-10-05 13:12:40 +02:00
Douwe Maan 782c017ca0 Make sure spec expectations are in their own paragraphs 2017-10-05 12:58:21 +02:00
Douwe Maan 0c0c2ecd99 Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails 
# Conflicts:
#	app/controllers/admin/users_controller.rb
#	app/controllers/confirmations_controller.rb
#	app/controllers/profiles/emails_controller.rb
#	app/models/user.rb
#	app/services/emails/base_service.rb
#	app/services/emails/destroy_service.rb
#	app/views/devise/mailer/confirmation_instructions.html.haml
#	lib/api/users.rb
#	spec/services/emails/destroy_service_spec.rb
 2017-10-05 12:48:22 +02:00
Grzegorz Bizon f3ec51beba Add a additional scope related to alive CI/CD statuses 2017-10-05 11:30:21 +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 951abe2b2e Load counts everywhere we render a group tree 2017-10-05 11:11:21 +02:00
Bob Van Landuyt 57bd3bb34a Force parents to be preloaded for building a hierarchy 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 167fd71348 Always preload all elements in a hierarchy to avoid extra queries. 2017-10-04 22:49:42 +02:00
Bob Van Landuyt ef043063f9 Clean up public/private api of `GroupDescendant` 
So only methods that are used elsewhere are public.
 2017-10-04 22:49:42 +02:00
Bob Van Landuyt cd85c22faa Rename hierarchies to descendants where applicable 2017-10-04 22:49:42 +02:00
Bob Van Landuyt 22aa034427 Rename `GroupHierarchy` to `GroupDescendant` 2017-10-04 22:49:41 +02:00
Bob Van Landuyt 3299a970e0 Handle all cases for merging a hierarchy 
The possible cases are:
 - [Array, Array]
 - [Array, Hash]
 - [Array, GroupHierarchy]
 - [Hash,Hash]
 - [Hash, GroupHierarchy]
 - [GroupHierarchy, GroupHierarchy]
 2017-10-04 22:49:41 +02:00
Bob Van Landuyt bb5187bb2a Handle case where 2 matches in the same tree are found 2017-10-04 22:49:41 +02:00
Bob Van Landuyt 518216c062 Merge group hierarchies when parents are shared 2017-10-04 22:49:41 +02:00
Bob Van Landuyt 438a0773dc Add a concern to build hierarchies of groups 2017-10-04 22:46:49 +02:00
Kamil Trzcinski bee5c08094 Fix Rubocop failures 2017-10-04 21:13:01 +02:00
Kamil Trzcinski 54831bd44b Updated messages and notices 2017-10-04 21:10:08 +02:00
Zeger-Jan van de Weg d5486807ba
Incorporate feedback 2017-10-04 21:01:27 +02:00
Eric Eastwood decf044369 Merge branch 'master' into 34102-online-view-of-artifacts-fe 2017-10-04 10:56:03 -05:00
Shinya Maeda a644f4b829 Add spec/models/gcp/cluster_spec.rb 2017-10-04 22:40:12 +09:00
Jacob Vosmaer 147e2b21be Let fetch_ref pull from Gitaly instead of from disk 2017-10-04 12:57:41 +02:00
Douwe Maan f0b4fe2fc2 Merge branch 'fix-ssh-key-mutation' into 'master' 
Ensure key fingerprints are generated correctly when modified

See merge request gitlab-org/gitlab-ce!14663
 2017-10-04 08:06:49 +00: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
Douwe Maan 2ee93c486c Merge branch '36876-mr-show-json-controller-perf-improvements' into 'master' 
Reduce method calls while evaluating Projects::MergeRequestsController#show.json

See merge request gitlab-org/gitlab-ce!14285
 2017-10-04 07:33:05 +00:00
Oswaldo Ferreira 1f54c9216f Reduce method calls while evaluating Projects::MergeRequestsController#show.json 2017-10-04 00:09:48 -03:00
Alejandro Rodríguez 79719cf003 Add OperationService.UserDeleteBranch Gitaly RPC 2017-10-03 21:06:34 -03:00
Nick Thomas eaa1ce4fbe
Ensure key fingerprints are generated correctly when modified 2017-10-03 18:45:01 +01:00
Jacob Vosmaer (GitLab) 5dd26d4e5a Hide Gollum inside Gitlab::Git::Wiki 2017-10-03 16:58:33 +00:00
Zeger-Jan van de Weg 8cbfe3aea6
Redirect to pages daemon 2017-10-03 12:34:24 +02:00
Kamil Trzciński b8e47d7263 Merge branch 'fix-kubectl-180' into 'master' 
Fix broken certificate-authority-data with kubectl >= 1.8.0

Closes #38685

See merge request gitlab-org/gitlab-ce!14635
 2017-10-03 08:57:12 +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
Alessio Caiazza 40c6128b39
Fix broken certificate-authority-data with kubectl >= 1.8.0 2017-10-03 09:10:40 +02:00
Robert Speicher 95f613837d Merge branch 'sh-fix-import-repos' into 'master' 
Fix gitlab-rake gitlab:import:repos task

Closes #37682

See merge request gitlab-org/gitlab-ce!14597
 2017-10-02 17:34:08 +00:00
Stan Hu bac2916030 Fix gitlab-rake gitlab:import:repos task 
Because of a change in GitLab 9.5.4 to prevent users from assuming control of
a repository already on disk, the import task broke. Imports would fail with
the message, "There is already a repository with that name on disk".

This change skips the validation when the import is done from the
command-line.

Closes #37682
 2017-10-02 08:51:37 -07:00
Dmitriy Zaporozhets f1b8d79f4a Merge branch 'fix/gpg/case-insensitive' into 'master' 
Make GPG validation case insensitive

See merge request gitlab-org/gitlab-ce!14376
 2017-10-02 15:37:04 +00: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
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
Douwe Maan a030dc4199 Merge branch 'remote_user' into 'master' 
Add GL_USERNAME environment variable for hooks

See merge request gitlab-org/gitlab-ce!13264
 2017-10-02 07:16:22 +00:00
Stan Hu 6188e449de Fix pushes to an empty repository not invalidating has_visible_content? cache 
`Repository#has_visible_content?` used to rely on the cached count of local branches, but
since it is now an independently cached value it needs to be invalidated on its own.

Closes #38646
 2017-10-01 22:14:11 -07:00
Alexandra ed3c25e429 spacing and small optimisations 2017-10-01 17:07:26 +02:00
Alejandro Rodríguez fa5f0164eb Implement OperationService.UserAddBranch Gitaly RPC 2017-09-30 00:58:56 -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
Tim Bishop a212391f0f Make GPG validation case insensitive. 
In line with other changes in GitLab, make email address validation
properly case insensitive. The email address in the commit may be in
any case, so it needs downcasing to match the address stored in GitLab
for the user. Without this change the comparison fails and commits are
not marked as verified.

See #37009.
 2017-09-29 20:30:58 +01:00
Jacob Vosmaer e5fecc3a37 Create repositories via Gitaly 2017-09-29 18:27:06 +02:00
Jacob Vosmaer (GitLab) 403712f06e Make Repository#has_visible_content more efficient 2017-09-29 13:08:44 +00:00
Ahmad Sherif 4f5be9ec7b Migrate Gitlab::Git::Repository#add_tag to Gitaly 
Closes gitaly#601
 2017-09-29 00:53:49 +02: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
Markus Koller e9eae3eb0d Support custom attributes on users 2017-09-28 16:49:42 +00:00
Gabriel Mazetto f4de14d71f
Add support to migrate existing projects to Hashed Storage async 2017-09-28 16:32:14 +01:00
Eric Eastwood 6f9a6d37a9 Merge branch 'master' into ff_port_from_ee 2017-09-26 16:24:54 -05:00
Tomasz Maczukin 48d9a72291
Fix locked shared runners problem 2017-09-25 16:23:13 +02:00