09c7044f08
Revert "DB change, migratoin and changelog"
...
This reverts commit af5242ecb682189c5d8276e1ab1ffe5ce844f2e5.
2019-09-04 03:51:43 +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
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
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
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
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
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
da0a5c7cc2
Merge branch 'ab-remove-support-bot-column' into 'master'
...
Remove Users.support_bot column
See merge request gitlab-org/gitlab-ce!32554
2019-09-03 11:58:03 +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
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
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
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
ab27d66a7f
Merge branch '51372-remove-milestone-tabs-deprecation-message' into 'master'
...
Remove deprecation message for milestone tabs
See merge request gitlab-org/gitlab-ce!32252
2019-09-03 05:55:51 +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
2f210e9c3f
Remove deprecation message for milestone tabs
...
We're reversing the deprecation due to user feedback
2019-09-03 09:17:23 +08: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
e6fb109d45
Merge branch 'cluster-form-ca-cert-larger' into 'master'
...
Expand textarea for CA cert in cluster form
See merge request gitlab-org/gitlab-ce!32508
2019-09-02 19:57:53 +00:00
1b81a81b95
Remove Users.support_bot column
...
This column is not present in `db/schema.rb` and hence needs to be
removed conditionally.
See https://gitlab.com/gitlab-org/gitlab-ce/issues/66901 for background
2019-09-02 20:22:20 +02: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
aaf243e7f9
Merge branch 'ab-admin-page-user-active-count' into 'master'
...
Replace indexes for counting active users
See merge request gitlab-org/gitlab-ce!32538
2019-09-02 14:52:43 +00:00
2d3dc05fb9
Update CHANGELOG.md for 12.2.4
...
[ci skip]
2019-09-02 14:28:55 +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
5b4108f0fd
Replace indexes for counting active users
...
This adjusts the partial condition for an index. The index is intended
to be used when counting active users with `ghost IS NOT TRUE AND
bot_type IS NULL`.
With the current index, this wasn't working as the partial condition
didn't match the query: `ghost <> TRUE` is not semantically equivalent
to `ghost IS NOT TRUE` (null semantics).
The reason we add an index particularly intended for EE is that the EE
query is going to have the additional part `AND bot_type IS NULL`
whereas the CE query doesn't. Logically, it'd be enough to have an index
for `ghost IS NOT TRUE`. However, on GitLab.com, the query planner makes
poor choices when the additional `AND bot_type IS NULL` part is present:
It goes for the index on `bot_type` and doesn't use the partial index.
Note the existing index isn't being used at all according to GitLab.com
index statistics. Hence we can first remove it and don't have to worry
about the window of time without an index.
Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/66770
2019-09-02 15:22:32 +02: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
6b0d8948ab
Remove reference of external example
...
as requested by the reviewer
2019-09-02 11:02:06 +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
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
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
84edac2a09
Merge branch 'sh-mermaid-8.2.6' into 'master'
...
Update Mermaid to v8.2.6
See merge request gitlab-org/gitlab-ce!32502
2019-09-02 08:22:20 +00:00
29ce598796
Add additional public note to project container registry setting
2019-09-02 05:22:37 +00:00
be0f039d9c
Fix upload URLs in Markdown
...
Fixes RelativeLinkFilter for users that don't have access
to the project's repository
2019-09-02 13:03:14 +08:00
bf230da05d
Support selective highlighting of lines
...
Instead of highlighting all lines when not all of them
are needed, only highlight from the beginning up to
the specified limit.
The `BlobPresenter#highlight` method has been updated
to support `to` param. This param will be used to limit
the content to be highlighted.
2019-09-02 11:44:45 +08:00
237de5c728
Expand textarea for CA cert in cluster form
...
The current default is too small
for a user to see what they have pasted in.
2019-09-02 14:13:54 +12:00
39bb3f6772
Merge branch 'update-workhorse' into 'master'
...
Update GitLab Workhorse to v8.10.0
See merge request gitlab-org/gitlab-ce!32501
2019-09-02 01:33:00 +00:00
6e744f7071
Merge branch 'sh-fix-ci-lint-500-error' into 'master'
...
Fix 500 error in CI lint when included templates are an array
Closes #66605
See merge request gitlab-org/gitlab-ce!32232
2019-09-02 01:00:29 +00:00
af4312f1d8
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-01 06:08:35 -07:00
a8a10a0038
Merge branch 'improve-chatops-help' into 'master'
...
Improve chatops help output
See merge request gitlab-org/gitlab-ce!32208
2019-09-01 12:42:22 +00:00
dcc680d516
Update GitLab Workhorse to v8.10.0
2019-09-01 13:38:43 +01:00
bfed409d37
Merge branch 'refactor/showStagedIcon' into 'master'
...
Refactor showStagedIcon property's behavior to match its name
Closes #66071
See merge request gitlab-org/gitlab-ce!32333
2019-09-01 02:58:31 +00:00
bf50573710
Fix 500 error in CI lint when included templates are an array
...
Previously the following syntax would fail in the linter with an
error 500:
```
include:
template:
- License-Management.gitlab-ci.yml
- Dependency-Scanning.gitlab-ci.yml
- SAST.gitlab-ci.yml
```
Now the error will call out specifically that the value
is not a string.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66605
2019-08-31 04:38:12 -07:00
9575288f62
Refactor showStagedIcon property's behavior to match its name
...
Previously, the `showStagedIcon` property was doing the opposite
of what its name suggested. It was rendering the staged icon when
`showStagedIcon` was `false` and rendering the regular icon when
it was `true`.
2019-08-30 17:08:16 -05:00
b943baa42a
Limit access request email to 10 most recently active owners/maintainers
...
This change limits the number of emails
for new access requests notifications to
10 most recently active owners/maintainers
2019-08-30 21:30:51 +00:00
05a37f69e1
Fix for #56295 , https://gitlab.com/gitlab-org/gitlab-ce/issues/56295 .
...
All avatars now visible in commit trailers.
2019-08-30 17:26:10 +00:00
Lee Tickett
Paul Slaughter
Jacques Erasmus
Mike Greiling
Nick Thomas
Stan Hu
Kushal Pandya
Alexandru Croitor
Yorick Peterse
Andreas Brandl
Etienne Baqué
Fatih Acet
Filipa Lacerda
Rémy Coutable
Giorgenes Gelatti
Heinrich Lee Yu
Brandon Williams
Tim Zallmann
Sean McGivern
GitLab Release Tools Bot
Douwe Maan
Grzegorz Bizon
mdhtr
Massimeddu Cireddu
Maneschi Romain
Nick Kipling
Patrick Bajao
Thong Kuah
Ash McKenzie
Arun Kumar Mohan
Manoj MJ
Jesse Hall