Commit Graph

49 Commits

Author SHA1 Message Date
Kamil Trzciński 1367e4ff9f Merge branch '44389-always-allow-http-for-ci-git-operations' into 'master'
Resolve "Allow HTTPS cloning by Runners if it is disabled for users"

Closes #44389

See merge request gitlab-org/gitlab-ce!18021
2018-04-05 18:34:00 +00:00
Tomasz Maczukin 9750006b1a
Update documentation 2018-04-05 16:43:52 +02:00
Eric Eastwood a6c7d8050e Add custom additonal email text to all emails
Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4474

Conflicts:
	db/schema.rb
	ee/app/controllers/ee/admin/application_settings_controller.rb
	ee/app/helpers/ee/application_settings_helper.rb
	ee/app/models/ee/application_setting.rb
	ee/app/models/license.rb
	ee/app/views/layouts/service_desk.html.haml
	ee/app/views/notify/approved_merge_request_email.html.haml
	ee/app/views/notify/service_desk_new_note_email.text.erb
	ee/app/views/notify/service_desk_thank_you_email.text.erb
	ee/app/views/notify/unapproved_merge_request_email.html.haml
	ee/lib/ee/api/entities.rb
	ee/spec/controllers/admin/application_settings_controller_spec.rb
	ee/spec/models/application_setting_spec.rb
	ee/spec/requests/api/settings_spec.rb
	lib/api/settings.rb
	spec/mailers/previews/notify_preview.rb
2018-04-04 12:29:03 -05:00
Sean McGivern 921c59a373 Clarify version check in admin settings 2018-03-07 10:55:20 +00:00
Victor Wu 6dcadfc900 Revert "Merge branch 'tc-info-version-check' into 'master'"
This reverts merge request !17257
2018-02-21 16:54:56 +00:00
Toon Claes b8b913b0fc Add more info about data collected when version check is enabled 2018-02-21 11:33:42 +01:00
James Ramsay 414c574f02 Update ConvDev Index docs w better screenshot 2018-01-17 16:38:40 -05:00
Ben Bodenmiller 80957f7404 remove period
[skip ci]
2017-09-30 03:02:42 +00:00
Bryce Johnson 0151eb590c Correctly link ConvDev Index nav links to its controller. 2017-09-08 15:21:42 -04:00
Achilleas Pipinellis 1322042bcb Split docs on IP whitelist for monitoring access 2017-07-16 11:25:34 +03:00
Achilleas Pipinellis e1339d9409 Update health check docs 2017-07-16 11:22:05 +03:00
Pawel Chojnacki 063f03b9d7 Differentiate shared test context using options hash instead of subject.
+ fix typos, and capitalization
+ point configuration to `gitlab.rb` as well
2017-07-10 17:00:43 +02:00
Pawel Chojnacki beb81e14ec Limit docs line lenght 2017-07-06 12:43:43 +02:00
Pawel Chojnacki c1b043bdb7 Bring back healthcheck token access to monitoring resources, but mark this as deprecated 2017-07-05 00:46:11 +02:00
Achilleas Pipinellis b13dcb2b9d Copyedit ConvDev docs 2017-06-16 10:56:54 +02:00
Victor Wu b43481bb7b convdev docs 2017-06-15 16:23:43 +00:00
Job van der Voort 0cb4552a52 removes unnecessary redundacy in usage ping doc 2017-05-22 15:27:51 +01:00
Job van der Voort 6ec19ffde0 change domain to hostname in usage ping doc 2017-05-22 10:11:06 +01:00
Job van der Voort f0b3ed91bc update the documentation to reflect upcoming changes to the usage ping 2017-05-11 09:20:12 +01:00
Sean McGivern 3c546acf78 Allow disabling usage ping in `gitlab.yml`
Setting `usage_ping_enabled` to false in `gitlab.yml`:

1. Disables the usage ping, regardless of the value stored in the database.
2. Prevents the usage ping from being enabled through the admin panel. It can
   only be enabled by either removing the line from `gitlab.yml` and configuring
   through the admin panel, or setting it to true in `gitlab.yml`.
2017-05-11 09:20:11 +01:00
Ben Bodenmiller f7186514be fix link to MR 10416 2017-04-29 05:25:26 +00:00
Job van der Voort c7289d3e15 correct documentation on opt-out-ness of usage ping 2017-04-26 17:24:09 +01:00
Joshua Lambert d9718f729e Add Health Check Documentation 2017-04-25 09:19:43 +00:00
Regis Freyd 650eed6ace Fixed wording 2017-04-20 12:35:41 +02:00
Regis Freyd 889b7e82b1 Fix headings 2017-04-20 10:38:23 +02:00
Regis Freyd 4c739130fa Add more information in the User cohort documentation
We needed to clarify what inactive users are.
2017-04-20 10:04:28 +02:00
Sean McGivern 5f570690d4 Add uploads and fix privacy policy wording 2017-04-18 19:49:30 +01:00
Regis Freyd a67b6b3894 Add missing links in the documentation 2017-04-14 15:20:55 +02:00
Sean McGivern 800baa426d Tidy up usage ping and cohorts docs 2017-04-14 15:20:55 +02:00
Regis Freyd 61eaf4fe17 Move documentation as per Axil comment 2017-04-14 15:20:55 +02:00
Sean McGivern b61199ce0c Add prometheus services to usage ping 2017-04-14 15:20:55 +02:00
Z.J. van de Weg f5b42881c8 Track Mattermost usage 2017-04-14 15:20:55 +02:00
Achilleas Pipinellis a19dd9ad25 Add documentation on Usage statistics and link from the admin area 2017-04-14 15:20:55 +02:00
Achilleas Pipinellis 0be25bffd8 Fix broken links in CI admin area docs
[ci skip]
2017-02-24 12:46:03 +01:00
Lin Jen-Shin 91965cefeb Remove syntax help link and update screenshot
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23943262
2017-02-22 23:48:49 +08:00
Lin Jen-Shin 0d0842a422 Update doc according to the new syntax 2017-02-21 02:36:11 +08:00
Lin Jen-Shin ad44252424 Add screenshot for default artifacts expiration,
and update screenshot for maximum artifacts size.
2017-02-21 02:33:02 +08:00
Lin Jen-Shin eede4ab1a2 0 for unlimited, disallow blank, feedback:
https://gitlab.com/gitlab-org/gitlab-ce/issues/27762#note_23520780
2017-02-16 23:40:13 +08:00
Lin Jen-Shin 9096647ff6 Wordings change, feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23437712
2017-02-16 19:34:50 +08:00
Lin Jen-Shin 4789fe25fd Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifacts-expiration
* upstream/master: (37 commits)
  Show merge errors in merge request widget
  Clarify that stage is needed to stop environments
  Fix broken link in university docs
  allow clicking on text or icon to trigger expand
  style links on system notes to look clickable
  Clean up terms used for issues. Use New instead of Add.
  Fix most of broken docs links
  Set `Auto-Submitted: auto-generated` header to emails
  Fix Rubocop offense
  Fix regression where cmd-click stopped working for todos and merge request tabs
  Remove changelog entries for 8.16.5 release
  Merge branch 'fix-github-import-MR-wrong-project' into 'security'
  Merge branch 'svg-xss-fix' into 'security'
  Merge branch 'fix-rdoc-xss' into 'security'
  Merge branch 'asciidoctor-xss-patch' into 'security'
  Specify that only project owners can transfer a project
  only load istanbul plugin in development mode
  Make Karma output look nicer for CI (!9165)
  Centers loading icon vertically and horizontally in pipelines table in commit view
  Rename builds to jobs in docs
  ...
2017-02-16 18:49:07 +08:00
Achilleas Pipinellis a084437b5c Rename builds to jobs in docs
[ci skip]
2017-02-15 12:12:35 +01:00
Lin Jen-Shin b72f00c7cf Update docs to reflect current behaviour 2017-02-15 16:03:58 +08:00
Lin Jen-Shin d2d30cff55 Initial implementation for default artifacts expiration
TODO: Add tests and screenshots
2017-02-15 15:31:51 +08:00
Reza Mohammadi d9ee55ee38 Bypass signup domain validation for external users
Fixes #25279
2017-02-08 13:04:07 +03:30
Achilleas Pipinellis af1dabe805 Reduce size of images from 25MB to 13MB using pngquant
Took it from https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/3232

[ci skip]
2016-11-22 19:53:43 +01:00
Achilleas Pipinellis 1bbe1cea91 Move health check docs under user/admin_area/monitoring
[ci skip]
2016-10-11 15:55:32 +02:00
Mark Fletcher 2835688f89 Clarify the features for generating default label sets
* Split out the information regarding the label set that GitLab can generate
* Add information for the labels view in the Admin panel
2016-08-09 14:29:16 +01:00
Achilleas Pipinellis c3ed78a4ed Refactor build artifacts documentation
- Split user and admin documentation
- Use new location paths
- Add new Continuous Integration guide for the Admin area
- Link to new guide from the Admin area
2016-08-04 13:06:26 +03:00
Achilleas Pipinellis 7a3b20ed36 Move admin application settings to own path
[ci skip]
2016-07-22 12:18:33 +03:00