1fbe0fa1dc
Add atlassian-jwt gem explicitly
...
This is used by the Jira integration in EE
2019-09-02 22:26:18 +08:00
d645196c4a
Merge branch 'docs/license-compliance' into 'master'
...
Update screenshots for License Compliance
Closes gitlab-ee#8910
See merge request gitlab-org/gitlab-ce!32537
2019-09-02 14:21:59 +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
1a060f7dca
Merge branch 'docs-maven-repo-cli-credentials' into 'master'
...
Added example for passing Maven repo credentials
Closes gitlab-ee#6711
See merge request gitlab-org/gitlab-ce!32073
2019-09-02 13:42:36 +00:00
c1000b7948
Added example for passing Maven repo credentials
2019-09-02 13:42:35 +00:00
12936a8d21
Merge branch 'docs-james-gill-contribution' into 'master'
...
Docs james gill contribution
See merge request gitlab-org/gitlab-ce!32520
2019-09-02 13:25:41 +00:00
a52f394bc5
Docs james gill contribution
2019-09-02 13:25:40 +00:00
bdd67a659e
Merge branch 'pl-fix-chat-notification-service' into 'master'
...
CE: Reduce amount of property definitions in ChatNotificationService
See merge request gitlab-org/gitlab-ce!32363
2019-09-02 13:25:16 +00:00
9260706d7b
Reduce amount of property definitions in ChatNotificationService
...
Before this commit we redefined properties for supported events on each
new instance of ChatNotificationService during "runtime".
This commit defines the properties only once during "compile time".
2019-09-02 13:25:15 +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
3cf2aac874
Update screenshots for License Compliance
2019-09-02 15:21:12 +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
305260df06
Merge branch 'qa/e2e-test-custom-email' into 'master'
...
Update views for testability and update page objects
See merge request gitlab-org/gitlab-ce!32451
2019-09-02 11:32:09 +00:00
71008250b2
Merge branch 'mdhtr_swagger-ui-ci-page-template' into 'master'
...
Add CI Pages template to display static OpenAPI specification files in SwaggerUI
See merge request gitlab-org/gitlab-ce!31183
2019-09-02 11:02:08 +00:00
6b0d8948ab
Remove reference of external example
...
as requested by the reviewer
2019-09-02 11:02:06 +00:00
6889196116
Backport EE issue 12996
2019-09-02 12:59:30 +02:00
937b202704
Merge branch '65389_wrong_format_on_ms_teams_integration_push_events_with_multi_line_commit_messages' into 'master'
...
Fixing #65389 - Wrong format on MS teams integration push events with multi line commit messages
Closes #65389
See merge request gitlab-org/gitlab-ce!32180
2019-09-02 10:43:55 +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
c0e679e098
Merge branch '60561-quick-action-label-first-for-issue' into 'master'
...
quick action label must be first in issue comment
Closes #60561
See merge request gitlab-org/gitlab-ce!32367
2019-09-02 10:42:12 +00:00
1eca1928eb
quick action label must be first in issue comment
2019-09-02 10:42:11 +00:00
146e12a07e
Merge branch '14756-move-shared-examples' into 'master'
...
Rename shared examples according to our guidelines
Closes gitlab-ee#14316
See merge request gitlab-org/gitlab-ce!32526
2019-09-02 10:19:52 +00:00
7f5eea2799
Merge branch 'winh-ci-lint-javascript-report' into 'master'
...
Remove lint:javascript:report job
See merge request gitlab-org/gitlab-ce!32462
2019-09-02 09:06:02 +00:00
ed437b248d
Remove lint:javascript:report job
2019-09-02 09:06:01 +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
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
863aa51cd6
Merge branch 'docs-geo-extra-space' into 'master'
...
Fix space in geo doc
See merge request gitlab-org/gitlab-ce!32522
2019-09-02 08:16:28 +00:00
a1ec6de360
Fix space in geo doc
2019-09-02 08:16:27 +00:00
73a88ca81b
Merge branch 'docs/edit-gitlab-pages-domains' into 'master'
...
Clarify new note for GitLab Pages
See merge request gitlab-org/gitlab-ce!32443
2019-09-02 08:14:40 +00:00
4ff8629841
Clarify new note for GitLab Pages
2019-09-02 08:14:39 +00:00
3b17b390bb
Merge branch '14634-broken-master-ee-spec-services-slash_commands-global_slack_handler_spec-rb-ce' into 'master'
...
Resolve "Broken master: ee/spec/services/slash_commands/global_slack_handler_spec.rb"
Closes #14634
See merge request gitlab-org/gitlab-ce!32518
2019-09-02 07:17:44 +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
fc9f3894e8
Correct typo in constant
2019-09-02 09:03:07 +02:00
516ce472ef
Merge branch 'typo-ci-reference' into 'master'
...
Fix typo in GitLab CI configuration reference
See merge request gitlab-org/gitlab-ce!32382
2019-09-02 06:43:47 +00:00
effd7e72e3
Merge branch 'fzimmer-master-patch-75127' into 'master'
...
Changed Geo general update steps
Closes gitlab-ee#12773
See merge request gitlab-org/gitlab-ce!32212
2019-09-02 06:38:46 +00:00
2dff44d0c1
Changed Geo general update steps
2019-09-02 06:38:45 +00:00
9cd8cfe62a
Merge branch 'ss/fix-sast-failure-on-master' into 'master'
...
Add argument to catch
See merge request gitlab-org/gitlab-ce!32484
2019-09-02 06:19:50 +00:00
c3c84ff8ea
Tidy up conditional message
2019-09-02 17:52:11 +12:00
b09c5f4ce4
Merge branch 'add-overcommit-support' into 'master'
...
Adds basic overcommit support
See merge request gitlab-org/gitlab-ce!31840
2019-09-02 05:38:28 +00:00
2fb6c9f3c7
Adds basic overcommit support
2019-09-02 05:38:27 +00:00
23bb9424c0
Handle projectless `help` commands to chatops
...
- Pass in a nil project to Gitlab::SlashCommands::ApplicationHelp.new
if the chatops command is help.
- Modify the Gitlab::SlashCommands::Presenters::Help message to skip
printing out project information.
2019-09-02 17:35:45 +12:00
cd8d008cb9
Merge branch 'add-warning-note-to-project-container-registry-setting' into 'master'
...
Add additional public note to project container registry setting
See merge request gitlab-org/gitlab-ce!32447
2019-09-02 05:22:37 +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
a1a6def114
Merge branch 'ee-11670-update-indexer-installation-docs' into 'master'
...
Update elasticsearch indexer installation instructions
Closes gitlab-ee#11670
See merge request gitlab-org/gitlab-ce!32274
2019-09-02 04:33:37 +00: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
34357e0386
Merge branch 'docs-fzimmer-geo-upgrade-troubleshooting' into 'master'
...
Added cross reference to the troubleshooting guide
See merge request gitlab-org/gitlab-ce!32346
2019-09-02 02:48:56 +00:00
99dfcf9a4e
Added cross reference to the troubleshooting guide
2019-09-02 02:48:55 +00:00
Heinrich Lee Yu
Marcia Ramos
Douwe Maan
Achilleas Pipinellis
Matt Penna
Marcel Amirault
Stan Hu
Peter Leitzen
Andreas Brandl
Grzegorz Bizon
Rémy Coutable
Nick Thomas
mdhtr
Sean Carroll
Massimeddu Cireddu
Maneschi Romain
Kushal Pandya
Winnie Hellmann
Filipa Lacerda
Evan Read
Fabian Zimmer
charlieablett
Thong Kuah
Giorgenes Gelatti
Nick Kipling
Patrick Bajao