690f8841c0
Separate menu item BE
2019-09-09 13:27:34 +03:00
f089a23015
Backport EE changes for productivity analytics
...
Improve diff lines count efficiency
2019-09-04 13:01:55 +03:00
fd561023c4
Merge branch '61927-internal-api-jwt-auth' into 'master'
...
Extract Workhorse <-> GitLab JWT authentication to make it reusable
See merge request gitlab-org/gitlab-ce!32623
2019-09-04 09:42:53 +00:00
f482a87639
Merge branch '61927-internal-api-namespace' into 'master'
...
Rename API::Internal class to API::Internal::Base
See merge request gitlab-org/gitlab-ce!32617
2019-09-04 09:40:35 +00:00
e8c58d62fb
Remove vue resource from group service
...
Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/66750
2019-09-04 03:45:28 +00:00
e4a1ac6160
Merge branch 'revert-2f01437f' into 'master'
...
Revert "Merge branch 'remove-vue-resource-from-sidebar-service' into 'master'"
See merge request gitlab-org/gitlab-ce!32620
2019-09-03 23:56:27 +00:00
85f89d21aa
Add cluster domain warning
...
Added a cluster domain wanring if no domain is defined
2019-09-03 23:15:13 +00:00
4c63c63192
Extract Workhorse <-> GitLab authentication to make it reusable
...
Introduce JWTAutheticatable module that can be reused for ai=uthtication
between Pages and GitLab (the same way we use do now for Workhorse).
Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/61927 .
2019-09-04 11:03:20 +12:00
3399335602
Revert "Merge branch 'remove-vue-resource-from-sidebar-service' into 'master'"
...
This reverts merge request !32400
2019-09-03 22:44:56 +00:00
c4b804c6db
Rename API::Internal class to API::Internal::Base
...
so that we can use API::Internal namespace.
Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/61927 .
2019-09-04 10:07:49 +12:00
243bd0202f
Create an event on epic actions
...
Creates new event when an epic is created, closed, reopened or
commented.
2019-09-03 21:29:55 +00:00
19371b9062
Revert "DB change, migratoin and changelog"
...
This reverts commit af5242ecb682189c5d8276e1ab1ffe5ce844f2e5.
2019-09-03 19:10:08 +00:00
c487c7cf6a
Revert "DB change, migratoin and changelog"
...
This reverts commit af5242ecb682189c5d8276e1ab1ffe5ce844f2e5.
2019-09-03 16:38:17 +00:00
3d8d394c97
Merge branch '13988-add-rails-helpers' into 'master'
...
Add new RailsHelpers module for specs
Closes #66688
See merge request gitlab-org/gitlab-ce!32309
2019-09-03 16:38:08 +00:00
6ef271af8f
Uses spec_helper instead of rails_helper
...
spec/rails_helper.rb was removed on
1068ec2e92
2019-09-03 15:56:53 +00:00
bc26349b76
Merge branch '62591-fix-milestone-due-date-today-wording' into 'master'
...
Fix wording on milestone due date today
Closes #62591
See merge request gitlab-org/gitlab-ce!32096
2019-09-03 13:49:16 +00:00
1068ec2e92
Merge branch '66741-remove-spec-rails_helper-rb' into 'master'
...
Remove spec/rails_helper.rb
Closes #66741
See merge request gitlab-org/gitlab-ce!32380
2019-09-03 13:48:17 +00:00
8326e84ed0
Merge branch 'ab-routable-nplus1' into 'master'
...
Preload routes information in Routable
See merge request gitlab-org/gitlab-ce!32352
2019-09-03 13:23:39 +00:00
f3b9ddb11b
Merge branch '66454-utils-parser' into 'master'
...
Creates utility parser for the job log
See merge request gitlab-org/gitlab-ce!32555
2019-09-03 12:28:18 +00:00
b07bfbcdf6
Merge branch 'mh/jest-fail-unmocked-requests' into 'master'
...
Make unmocked requests fail in Jest again
See merge request gitlab-org/gitlab-ce!31863
2019-09-03 12:26:49 +00:00
8e6e1e1d15
Fix wording on milestone due date today
...
Fix wording on milestone due date, to show today instead of
hours ago or remaining, when milestone is due today.
2019-09-03 15:19:58 +03:00
aa34c693e9
Merge branch 'clusterable_cluster_environments_path' into 'master'
...
Add #environments_cluster_path which will always return nil in CE
See merge request gitlab-org/gitlab-ce!32527
2019-09-03 11:26:23 +00:00
53801b1206
Preload routes information
...
This fixes a high frequency N+1 issue:
`RoutableActions#find_routable!` is used across many controllers to
retrieve e.g. the Project or Namespace by path. The `#find_routable!`
method calls `#ensure_canonical_path` which in turn retrieves
`#full_path` from the given Routable.
This in turn triggers a lookup on `routes`, leading to a high frequency
of these queries:
```sql
SELECT "routes".* FROM "routes" WHERE "routes"."source_id" = $1 AND
"routes"."source_type" = $2 LIMIT $3
```
This is unnecessary as we already join `routes` in
`Routable#find_by_full_path` anyways.
2019-09-03 12:16:03 +02:00
8c5d3fa63e
Merge branch 'winh-quarantine-dashboard_spec' into 'master'
...
Quarantine flaky dashboard_spec.js
See merge request gitlab-org/gitlab-ce!32574
2019-09-03 10:03:09 +00:00
a43ab8d6a4
Added relationships between Release and Milestone
...
Modified schema via migrations.
Added one-to-one relationship between the two models.
Added changelog file
2019-09-03 09:38:59 +00:00
6b7fe67ada
Merge branch 'add-pipeline-type-key-in-pipeline-entity' into 'master'
...
Expose `name` and `merge_request_event_type` in serialized json and predefined variables
See merge request gitlab-org/gitlab-ce!32323
2019-09-03 09:18:46 +00:00
b7f4a7077f
Skip set_repo_refs to speed up the tests
2019-09-03 09:15:47 +00:00
3741402a24
Make flash notifications sticky
...
This commit also unifies layout structure
and remove no_container flag
2019-09-03 09:03:35 +00:00
876ae19d9e
Creates utils for the job log
...
With the new job log json format
we need a parser on the frontend
2019-09-03 09:32:42 +01:00
cea72e9042
Quarantine flaky dashboard_spec.js
2019-09-03 08:23:04 +00:00
af5f2424ca
Merge branch 'change-role-system-hook' into 'master'
...
Add system hooks for project/group membership updates
Closes gitlab-ee#12252
See merge request gitlab-org/gitlab-ce!32371
2019-09-03 07:08:40 +00:00
8c21610c79
Add pipeline.type key to PipelineEntity
...
This commit adds pipeline.type key to PipelineEntity.
This key will be used in MR widget in the next iteration.
2019-09-03 13:30:53 +07:00
8dcddb9886
Stub DetectRepositoryLanguagesWorker for all tests
...
It performs an expensive operation, but isn't required in
most of tests
2019-09-03 06:19:21 +00:00
594f56e1ef
Merge branch 'an-use-labkit-correlation-id' into 'master'
...
Remove all references to Gitlab::CorrelationId
See merge request gitlab-org/gitlab-ce!32228
2019-09-03 04:43:46 +00:00
f5b2899422
If user can push to docker then it can delete too
...
Extends the permission of $CI_REGISTRY_USER to allow them
to delete tags in addition to just pushing.
https://gitlab.com/gitlab-org/gitlab-ce/issues/40096
2019-09-03 02:41:22 +00:00
2bd4d580d1
Add system hooks for project/group membership updates
...
When updating group and project members, new system hooks
`user_update_for_group` and `user_update_for_team` will be executed.
Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/12252
2019-09-02 18:35:36 -05:00
1894c6ebe8
Add facade which will always return nil in CE
...
This method will be overridden in EE
2019-09-03 11:29:57 +12:00
407132bfd4
Merge branch '66393-proposal-remove-area-chart-in-favor-of-time-series' into 'master'
...
Remove area chart in favor of time series
Closes #66393
See merge request gitlab-org/gitlab-ce!32129
2019-09-02 20:04:02 +00:00
075f6d3559
Add X-GitLab-NotificationReason header to note emails
...
The 'assigned' reason doesn't apply to notes, but the other two
can ('mentioned' and 'own_activity'), so we can still use this for note
emails.
2019-09-02 12:15:24 -05:00
526ea7c5b6
Update Mermaid to v8.2.6
...
This fixes a regression where an underscore in labels no
longer worked:
https://github.com/knsv/mermaid/releases
2019-09-02 16:50:09 +00:00
414523b0bf
Handle :9090 and 0.0.0.0:9090 listen_address formats
...
Prometheus listen_address can be in formats of :9090 and 0.0.0.0:9090.
But before these can be used to connect a project to Prometheus, they
have to converted into absolute URIs.
2019-09-02 14:35:02 +00:00
68bfb091ae
Merge branch '65152-unfolded-lines-perf-improvement' into 'master'
...
Support selective highlighting of lines
See merge request gitlab-org/gitlab-ce!32514
2019-09-02 14:15:16 +00:00
60fd42172f
Merge branch '66803-fix-uploads-relative-link-filter' into 'master'
...
Fix permissions check in `RelativeLinkFilter`
See merge request gitlab-org/gitlab-ce!32448
2019-09-02 12:05:33 +00:00
aef0d81792
Fixing #65389
...
Wrong format on MS Teams integration push events with multi line commit messages
2019-09-02 10:43:54 +00:00
1eca1928eb
quick action label must be first in issue comment
2019-09-02 10:42:11 +00:00
fc6f8a6a44
Rename shared examples according to our guidelines
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-09-02 10:58:00 +02:00
b7398bc1fd
Merge branch 'fix-peek-on-puma' into 'master'
...
Fix Peek on Puma
Closes #66528
See merge request gitlab-org/gitlab-ce!32213
2019-09-02 08:43:21 +00:00
d6de7c6550
Merge branch '50013-add-browser-platform-flags-sign-in-pages' into 'master'
...
Add CSS & JS global flags to represent browser and platform on login pages
See merge request gitlab-org/gitlab-ce!32521
2019-09-02 08:28:11 +00:00
86cdf212fd
Merge branch '65304-add-pages-first-deployment-message' into 'master'
...
Resolve "Improve pages load wait time experience"
Closes #65304
See merge request gitlab-org/gitlab-ce!32122
2019-09-02 08:26:28 +00:00
68e1c9206b
Add browser and platform flags
...
- Adds CSS classes to represent browser & platform
- Adds JS flags to `gl` object to represent
browser & platform
2019-09-02 12:44:13 +05:30
Olena Horal-Koretska
Pavel Shutsin
Kamil Trzciński
Lee Tickett
Paul Slaughter
Jacques Erasmus
Krasimir Angelov
Mike Greiling
Jan Provaznik
Stan Hu
Mayra Cabrera
Nick Thomas
Grzegorz Bizon
Kushal Pandya
Alexandru Croitor
Andreas Brandl
Tim Zallmann
Etienne Baqué
Igor
Fatih Acet
Filipa Lacerda
Winnie Hellmann
Rémy Coutable
Shinya Maeda
Ash McKenzie
Giorgenes Gelatti
Brandon Williams
Thong Kuah
Sean McGivern
Reuben Pereira
Douwe Maan
Massimeddu Cireddu
Maneschi Romain