ebbcc17f24
Merge branch 'feature/webide_escaping' of gitlab.com:hiddentiger/gitlab-ce into feature/webide_escaping
2019-04-03 11:38:46 +00:00
7700e02988
Merge branch '52560-fix-duplicate-tag-system-hooks' into 'master'
...
Only execute system hooks once when pushing tags
Closes #52560
See merge request gitlab-org/gitlab-ce!26888
2019-04-03 10:20:50 +00:00
5a6908e3e5
Merge branch '59756-shared-example-already-defined' into 'master'
...
Remove already defined shared example
Closes #59756
See merge request gitlab-org/gitlab-ce!26867
2019-04-03 10:15:47 +00:00
6ee1d8cf77
Add port section to CI Image object
...
In order to implement https://gitlab.com/gitlab-org/gitlab-ee/issues/10179
we need several modifications on the CI config file. We are
adding a new ports section in the default Image object.
Each of these ports will accept: number, protocol and name.
By default this new configuration will be only enabled in
the Web IDE config file.
2019-04-03 09:50:54 +00:00
b1f9e05a73
Merge branch '55268-exclude-system-notes-from-commits-in-mr' into 'master'
...
Do not show system notes on commits in the MR page
Closes #55268
See merge request gitlab-org/gitlab-ce!26396
2019-04-03 09:45:31 +00:00
478077747d
Merge branch '47234-composable-auto-devops' into 'master'
...
Resolve "Composable Auto DevOps"
Closes #47234
See merge request gitlab-org/gitlab-ce!26520
2019-04-03 09:05:28 +00:00
07cc188535
Merge branch '53459-quick-action-adds-multiple-labels-to-issue-if-middle-words-overlap-with-existing-label' into 'master'
...
Resolve "Quick Action Adds Multiple Labels to Issue If Middle Words Overlap with Existing Label"
Closes #53459
See merge request gitlab-org/gitlab-ce!26602
2019-04-03 08:28:10 +00:00
46fdec84dd
Extend timezone dropdown
...
Adds optional paramters to the constructor to allow
reuse of the timezone dropdown on other pages
2019-04-03 08:27:16 +00:00
1926bb24d8
Merge branch 'fix-broken-master-release-permission-ce' into 'master'
...
Backport: Fix Release permission spec
See merge request gitlab-org/gitlab-ce!26897
2019-04-03 08:24:39 +00:00
a374d690e7
Merge branch 'fixed-duplicated-large-text-on-diffs' into 'master'
...
Fixes duplicate diff too large error messages
Closes #59802
See merge request gitlab-org/gitlab-ce!26857
2019-04-03 08:05:52 +00:00
e3b38ae09d
Fix Release permission spec
...
We recently changed the permission model to disallow guests to read
Releases. The spec should be updated as well according to the
expectation.
2019-04-03 13:55:39 +07:00
d17cce6aed
Only execute system hooks once when pushing tags
2019-04-03 01:53:38 +01:00
2378dde2e2
Remove non-functional add issue button on welcome list
2019-04-02 20:23:23 +00:00
0c45e268a1
Revert "Merge branch 'jprovazn-graphql-prometheus' into 'master'"
...
This reverts merge request !26569
2019-04-02 20:05:56 +00:00
3bc3018518
Fix quick actions add label name middle word overlaps
...
Fixes quick actions add label when adding a label which name middle
word overlaps with another label name: for example adding "A B C" when
also label "B" exists.
With the fix only the label "A B C" is correctly added, previously
also the label "B" was added due to the middle word overlaps.
2019-04-02 18:28:25 +02:00
23c353515f
Merge branch 'ce-reduce-diff-in-spec-models' into 'master'
...
[CE] Reduce diff with EE in `spec/models`
See merge request gitlab-org/gitlab-ce!26847
2019-04-02 15:37:35 +00:00
0e5dbaf87f
Do not show system notes on commits in the MR page
2019-04-02 22:59:43 +08:00
3d24e7225e
Merge branch 'ce-6119-extract-ee-specific-files-lines-for-spec-services-groups' into 'master'
...
Remove groups destroy race condition spec
See merge request gitlab-org/gitlab-ce!26851
2019-04-02 14:57:16 +00:00
723f936fb1
Merge branch 'sh-cache-pipeline-find-commits' into 'master'
...
Cache FindCommit results in pipelines view
See merge request gitlab-org/gitlab-ce!26776
2019-04-02 14:29:49 +00:00
6b24eb9ce6
Remove already defined shared example
...
Removing the time traking shared example as it was actually moved
under time_tracking_quick_action_shared_examples.rb filename to a
different path as part of spec refactorign for quick action
https://gitlab.com/gitlab-org/gitlab-ce/issues/50199
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26095
2019-04-02 17:22:29 +03:00
35b9274f12
Stop calling UnlinkRepositoryFromObjectPool RPC
...
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/59777 .
In earlier iterations of our implementation of Git object deduplication
we thought we would be making extensive use of Git remotes in pool
repositories in the future, and that we should manage these remotes
carefully from the start. We now expect we only care about one remote,
namely the source project. The other remotes are there only for forensic
purposes.
Before this MR we tried to also remove pool remotes when member projects
got deleted, with the UnlinkRepositoryFromObjectPool RPC. This is
fragile when there are race conditions (see
https://gitlab.com/gitlab-org/gitaly/issues/1568#note_153955926 ). We
have spent some time making this RPC less fragile in
https://gitlab.com/gitlab-org/gitaly/merge_requests/1151 but looking at
this problem again, I think we should just stop calling it.
2019-04-02 13:20:26 +00:00
4b9dbec33c
Merge branch 'jarv/dev-to-gitlab-2019-04-02' into 'master'
...
Jarv/dev to gitlab 2019 04 02
Closes #2810
See merge request gitlab-org/gitlab-ce!26846
2019-04-02 12:56:40 +00:00
eebf24ead5
Fixes duplicate diff too large error messages
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59802
2019-04-02 13:24:36 +01:00
2179a98391
Merge branch 'expose-mr-pipeline-parameters-for-merge-widget-ce' into 'master'
...
Backport: Expose merge request pipeline parameters for MR widget
See merge request gitlab-org/gitlab-ce!26826
2019-04-02 12:03:21 +00:00
e37383d453
Cache FindCommit results in pipelines view
...
For each pipeline, the controller will call `Pipeline#latest?` to
determine if the pipeline's ref is the latest for that branch.
Since it's likely that the same branches are being used in each
pipeline, we can reduce Gitaly overhead by caching the results
of the FindCommit call.
2019-04-02 04:15:32 -07:00
351b39f172
Backport splitting approval changes from CE
...
Author and committers approvals are split in EE
This commit provides backports for those changes
This reverts commit 886f00bcba
2019-04-02 11:01:07 +00:00
0e66357a3e
Monitor GraphQL with Prometheus
...
Extends graphql's platform tracing class to observe duration
of graphql methods.
In graphql 1.8.11 is added prometheus class but it's not very useful
for us because it uses prometheus_exporter to export results.
2019-04-02 10:26:53 +00:00
e540ae798b
Remove groups destroy race condition spec
...
This was removed in the below MR in EE only, as it was causing failures
related to Geo.
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3999
2019-04-02 10:50:58 +01:00
d7583addf2
Merge branch 'sh-fix-rugged-tree-entries' into 'master'
...
Avoid excessive recursive calls with Rugged TreeEntries
Closes #59759
See merge request gitlab-org/gitlab-ce!26813
2019-04-02 09:27:17 +00:00
a04e1d5e32
Backport EE change
...
This is for merge request pipelines
2019-04-02 15:55:06 +07:00
f87b7fe3b3
Merge branch 'issue_51789_part_1' into 'master'
...
Migrate issuable states to integer patch 1 of 2
Closes #51789
See merge request gitlab-org/gitlab-ce!25107
2019-04-02 08:39:53 +00:00
8708c720c5
[CE] Reduce diff with EE in spec/models/project_wiki_spec.rb
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-04-02 10:22:49 +02:00
f3ad4ecb73
[CE] Reduce diff with EE in spec/models/project_team_spec.rb
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-04-02 10:21:35 +02:00
0f369d145b
[CE] Reduce diff with EE in spec/models/project_spec.rb
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-04-02 10:21:35 +02:00
590129a892
[CE] Reduce diff with EE in spec/models/environment_spec.rb
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-04-02 10:21:34 +02:00
7c26c47cb5
[CE] Reduce diff with EE in spec/models/concerns/prometheus_adapter_spec.rb
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-04-02 10:21:34 +02:00
69b65a6b74
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into jarv/dev-to-gitlab-2019-04-02
2019-04-02 10:12:32 +02:00
a466d97e62
Rake task for removing exif from uploads
...
Adds a rake task which can be used for removing EXIF
data from existing uploads.
2019-04-02 07:48:35 +00:00
6557858fae
Merge branch 'security-2819-xss-resolve-conflicts-branch-name' into 'master'
...
Fix XSS in resolve conflicts form
See merge request gitlab/gitlabhq!2977
2019-04-02 07:48:33 +00:00
3e4c2b0427
Merge branch 'security-56224' into 'master'
...
Fix related branches visible in issues for guests
See merge request gitlab/gitlabhq!2996
2019-04-02 07:48:30 +00:00
b122be5ed5
Merge branch 'security-id-potential-denial-languages' into 'master'
...
Return cached languages if they've been detected before
See merge request gitlab/gitlabhq!2998
2019-04-02 07:48:28 +00:00
02dcecdb5f
Merge branch 'security-55503-fix-pdf-js-vulnerability' into 'master'
...
Fix PDF.js vulnerability
See merge request gitlab/gitlabhq!2999
2019-04-02 07:48:26 +00:00
3098259e90
Merge branch 'security-use-untrusted-regexp' into 'master'
...
Use UntrustedRegexp for CI refs matching
See merge request gitlab/gitlabhq!3005
2019-04-02 07:48:24 +00:00
e116842ad9
Merge branch 'security-milestone-labels' into 'master'
...
[master] Check label_ids parent when updating issue board
See merge request gitlab/gitlabhq!3027
2019-04-02 07:48:22 +00:00
b4e659a38e
Merge branch 'security-mass-assignment-on-project-update' into 'master'
...
Disallow changing namespace of a project in update method
See merge request gitlab/gitlabhq!3028
2019-04-02 07:48:20 +00:00
6473f69761
Add new field to Clusters table
...
Adds boolean field 'managed' to clusters table. This new column will be
used to distinguish those clusters that are automatically managed by
gitlab.
Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/56557
2019-04-02 06:54:54 +00:00
22fe2fb4c1
Fix group transfer selection possibilities
2019-04-02 06:49:11 +00:00
3be46bdf08
Split Security Auto DevOps jobs into templates
...
Container Scanning, Dependency Scanning, License Management
and SAST parts of Auto DevOps now use the preexisting templates.
Auto DevOps and the DAST job template will now use a
shared job template instead of maintaining two copies
of the job. This also allows Auto DevOps to use custom
authentication with DAST.
2019-04-02 13:31:26 +11:00
dba3fc4666
Merge branch 'bvl-stream-io-into-gitaly' into 'master'
...
Allow streaming io objects into Gitaly
See merge request gitlab-org/gitlab-ce!26738
2019-04-01 22:27:11 +00:00
9269ac1b69
Merge branch 'winh-rejected-jest-promises' into 'master'
...
Fail Jest tests for unhandled Promise rejections
Closes #56053
See merge request gitlab-org/gitlab-ce!26424
2019-04-01 20:55:17 +00:00
Kieran Andrews
Rémy Coutable
Sean McGivern
Francisco Javier López
Dmitriy Zaporozhets
Ezekiel Kigbo
Filipa Lacerda
Shinya Maeda
Nick Thomas
Donald Cook
Jan Provaznik
Jacopo
Lin Jen-Shin
Heinrich Lee Yu
Kamil Trzciński
Alexandru Croitor
Jacob Vosmaer
Robert Speicher
Phil Hughes
Stan Hu
Igor
John Jarvis
GitLab Release Tools Bot
Mayra Cabrera
Peter Marko
Tiger
Fatih Acet