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
95,735 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

625 Commits

Author SHA1 Message Date
Shinya Maeda c5c41ae065 Ignore legacy artifact columns in Project Import/Export 
Ignore some columns
 2019-06-11 18:39:29 +07:00
Robert Speicher a2c767b9f8
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2019-06-03 10:04:57 -07:00
Robert Speicher 2b13462ac4 Merge branch 'security-58856-persistent-xss-in-note-objects' into 'master' 
Persistent XSS in note objects CE

See merge request gitlab/gitlabhq!3075
 2019-06-03 17:01:10 +00:00
Yorick Peterse 6cb750a2bb
Merge dev.gitlab.org master into GitLab.com master 2019-06-03 14:56:33 +02:00
Zeger-Jan van de Weg 951afba624
Remove hook directory requirement from Shell 
It used to be the case that GitLab created symlinks for each repository
to one copy of the Git hooks, so these ran when required. This changed
to set the hooks dynamically on Gitaly when invoking Git.

The side effect is that we didn't need all these symlinks anymore, which
Gitaly doesn't create anymore either. Now that means that the tests in
GitLab-Rails should test for it either.

Related: https://gitlab.com/gitlab-org/gitaly/issues/1392#note_175619926
 2019-05-30 20:04:08 +02:00
Douwe Maan a9bcddee4c Protect Gitlab::HTTP against DNS rebinding attack 
Gitlab::HTTP now resolves the hostname only once, verifies the IP is not
blocked, and then uses the same IP to perform the actual request, while
passing the original hostname in the `Host` header and SSL SNI field.
 2019-05-30 10:47:31 -03:00
Tiger 93a5071a3b Remove unused fixture lines 2019-05-28 09:44:45 -05:00
Liam McAndrew 5ddb32f382 Fix order dependency with user params during imports 2019-05-28 10:31:51 +00:00
James Lopez 30d915110f Fix issue importing members with owner access 2019-05-23 13:10:38 +00:00
Stan Hu 5c8cd42bbd Fix invalid visibility string comparison in project import 
This resolves an "ArgumentError: comparison of String with 0 failed"
issue where the visibility_level is stored as a string in the project
import data because the value comes directly from the Web form. This
problem happened upon creating a project from a template or restoring a
project.

We now cast the value to an integer to guard against these kinds of
failures.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61692
 2019-05-22 11:32:23 -07:00
Heinrich Lee Yu e938d241ea Include type to notes import / export 2019-05-17 16:45:40 +08:00
Shinya Maeda d4d2cf7327 Fix merge request pipeline exist method 
Refactor
 2019-05-06 13:20:47 +07:00
charlieablett 4b46b53082 Add `html` to sensitive words 2019-05-01 10:38:41 +12:00
charlieablett f2bc55d76f Remove accidental regressions 2019-04-30 21:00:57 +12:00
Ash McKenzie 3d0fc7fe2e
Ensure Issue & MR note_html cannot be imported 2019-04-30 18:27:56 +10:00
Jason Goodman fe86890b9d Add deployment events to chat notification services 
This enables sending a chat message to Slack or Mattermost
  upon a successful, failed, or canceled deployment
 2019-04-26 21:08:41 +00:00
Reuben Pereira 4376167a04 Add ProjectMetricsDashboardSetting model and table 
This new table will be used to store the external_dashboard_url which
allows users to add a link to their external dashboards (ex Grafana)
to the Metrics dashboard.
 2019-04-26 17:23:26 +00:00
Francisco Javier López 7d85448b58 Fix bug when project export to remote url fails 2019-04-24 15:34:06 +00:00
charlieablett 7e6befc05d Add disallowed fields to AttributeCleaner 2019-04-24 14:31:20 +12:00
charlieablett b8c3e60ea2 Re-stub stubbed method calls 2019-04-23 23:30:32 +12:00
charlieablett 0f2dff6264 Exclude fields from note import 2019-04-23 20:57:24 +12:00
Jasper Maes 624a1cdab4 Upgrade Rails to 5.1.6.1 
Model.new.attributes now also returns encrypted attributes.
 2019-04-23 08:31:23 +08:00
Sean McGivern cd9ae6bb82 Revert "Remove HipChat integration from GitLab" 
This reverts commit a5378665a1.
 2019-04-10 12:58:18 +01:00
Imre Farkas 9bc5ed14fe Move Contribution Analytics related spec in spec/features/groups/group_page_with_external_authorization_service_spec to EE 2019-04-09 15:38:58 +00:00
Oswaldo Ferreira ca884980ee [CE] Support multiple assignees for merge requests 
Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161
(code out of ee/ folder).
 2019-04-08 18:40:00 -03:00
Andreas Brandl 46b1b9c1d6 Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'" 
This reverts merge request !26823
 2019-04-05 13:02:56 +00:00
Imre Farkas d9d7237d2e Move Contribution Analytics related spec in spec/features/groups/group_page_with_external_authorization_service_spec to EE 2019-04-05 11:45:47 +00:00
Felipe Artur 16a3fea399 Merge master 2019-03-27 15:19:12 -03:00
Oswaldo Ferreira 03e0604d5d Prepare suggestion implementation for multi-line 
Adds the groundwork needed in order to persist multi-line suggestions,
while providing the parsing strategy which will be reused for the
**Preview** as well.
 2019-03-27 12:26:53 -03:00
Oswaldo Ferreira 929ee4d18d Add multiple assignees migration and table population 
This will be further required for supporting multi-assignees MRs
 2019-03-25 19:50:40 -03:00
John Jarvis 83cb748256 Merge branch 'merge-dev-to-master' into 'master' 
Merge dev.gitlab.org master into GitLab.com master

Closes #2794, #2814, #2806, #2805, #2798, #2795, #2788, and #2787

See merge request gitlab-org/gitlab-ce!25746
 2019-03-05 10:28:59 +00:00
Shinya Maeda 18889696bd Rename ambiguous association names in Ci::Pipeline 
fix it ok

Fix

head pipeline
 2019-03-05 11:36:26 +07:00
Francisco Javier López ebf16ada85 Arbitrary file read via MergeRequestDiff 2019-03-04 18:36:34 +00:00
Shinya Maeda 314062fec5 Persist source sha and target sha for merge pipelines 
source_sha and target_sha are used for merge request pipelines
 2019-02-27 17:12:04 +09:00
Sean McGivern f26cd63b0f Merge branch 'add_YouTrack_integration' into 'master' 
Added YouTrack integration

Closes #42595

See merge request gitlab-org/gitlab-ce!25361
 2019-02-26 15:06:29 +00:00
James Lopez c643042a49
Fix project import error on releases 2019-02-22 15:07:53 +01:00
James Fargher 2d19b1adef Move ChatOps to Core 
ChatOps used to be in the Ultimate tier.
 2019-02-20 21:29:48 +00:00
Felipe Artur 648b87315d Merge branch 'master' into issue_51789_part_1 2019-02-19 11:35:29 -03:00
Yauhen Kotau 04daa0b970 Added YouTrack integration 
Fixes gitlab-org/gitlab-ce#42595
 2019-02-18 20:08:36 +03:00
Felipe Artur bf99ce7bf8 Fix specs 2019-02-15 14:37:55 -02:00
James Lopez 401a3bca40
Fix import_jid error on project import 2019-02-14 09:29:42 +01:00
Nick Thomas a5378665a1
Remove HipChat integration from GitLab 2019-02-08 18:20:38 +00:00
Reuben Pereira 2079444091 DB and model changes for Sentry project selection dropdown 2019-02-04 12:12:24 +00:00
Kamil Trzciński d4c7214799
[master] Pipelines section is available to unauthorized users 2019-01-31 16:52:50 +01:00
James Lopez f78545af98
Fix tree restorer visibility level 2019-01-31 16:52:49 +01:00
James Lopez 57f082d969
Fix path disclosure on Project Import 2019-01-31 16:51:16 +01:00
Grzegorz Bizon 3508948dfe Add a new relation between a stage and related bridges 2019-01-25 10:39:26 +01:00
Grzegorz Bizon cfbcc191f0 Add new pipeline relation to import/export specs 2019-01-25 10:39:11 +01:00
Rémy Coutable 3a2abc1d50
Enable the Layout/ExtraSpacing cop 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2019-01-24 13:05:45 +01:00
Reuben Pereira f40b5860d7 Add table and model for error tracking settings 2019-01-07 17:55:21 +00:00