Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Documentation and link to explanation of prometheus_multiproc_dirpawel/prometheus_multiproc_dir_documentation | Pawel Chojnacki | 2017-07-20 | 1 | -1/+15 |
| | | | | - Change the wording a little bit | ||||
* | Merge branch 'rs-disable-test-log-in-ci' into 'master' | Rémy Coutable | 2017-07-18 | 1 | -0/+5 |
|\ | | | | | | | | | Disable Rails logging in CI test environments See merge request !12847 | ||||
| * | Disable Rails logging in CI test environmentsrs-disable-test-log-in-ci | Robert Speicher | 2017-07-18 | 1 | -0/+5 |
| | | | | | | | | See https://jtway.co/speed-up-your-rails-test-suite-by-6-in-1-line-13fedb869ec4 | ||||
* | | Fix merge conflicts | Joshua Lambert | 2017-07-18 | 44 | -256/+451 |
|\ \ | |||||
| * \ | Merge branch '35175-update-prometheus-admin-documentation-for-9-4-docs' into ↵ | Marcia Ramos | 2017-07-18 | 2 | -2/+3 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update Prometheus admin documentation for 9.4 - docs Closes #35175 See merge request !12903 | ||||
| | * | | Fixed typos35175-update-prometheus-admin-documentation-for-9-4-docs | Joshua Lambert | 2017-07-18 | 1 | -2/+2 |
| | | | | |||||
| | * | | Update admin docs | Joshua Lambert | 2017-07-17 | 2 | -2/+3 |
| | | | | |||||
| * | | | Update 9.3-to-9.4.md | Andrew Newdigate | 2017-07-17 | 1 | -2/+1 |
| |/ / | |||||
| * | | Merge branch 'google-launcher' into 'master' | Robert Speicher | 2017-07-16 | 1 | -4/+4 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update Google launcher details [ci skip] See merge request !12899 | ||||
| | * | | Update Google launcher detailsgoogle-launcher | eliran.mesika | 2017-07-16 | 1 | -4/+4 |
| | | | | |||||
| * | | | Merge branch 'docs/fix-link-styleguide' into 'master' | Marcia Ramos | 2017-07-16 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Fix wrong link to docs in docs styleguide See merge request !12901 | ||||
| | * | | | Fix wrong link to docs in docs styleguide | Achilleas Pipinellis | 2017-07-16 | 1 | -2/+2 |
| | |/ / | |||||
| * | | | Merge branch 'docs/update-health-check' into 'master' | Marcia Ramos | 2017-07-16 | 3 | -79/+114 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Update health check docs See merge request !12794 | ||||
| | * | | | Split docs on IP whitelist for monitoring accessdocs/update-health-check | Achilleas Pipinellis | 2017-07-16 | 3 | -34/+52 |
| | | | | | |||||
| | * | | | Update health check docs | Achilleas Pipinellis | 2017-07-16 | 1 | -70/+87 |
| | |/ / | |||||
| * | | | Update issue-related docs | Marcia Ramos | 2017-07-16 | 3 | -10/+29 |
| | | | | |||||
| * | | | Refactor groups docs | Marcia Ramos | 2017-07-16 | 30 | -150/+214 |
| | | | | |||||
| * | | | Add subgroups limitations to Pages docs | Marcia Ramos | 2017-07-16 | 2 | -7/+15 |
| | | | | |||||
| * | | | Merge branch 'docs/overview-features-5' into 'master' | Achilleas Pipinellis | 2017-07-16 | 1 | -0/+64 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Update MR-related docs See merge request !12875 | ||||
| | * | | | add changes from EE-updatesdocs/overview-features-5 | Marcia Ramos | 2017-07-13 | 1 | -0/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2350 + copyedit (goes with 80edf00) | ||||
| * | | | | Merge branch 'ad_matching_rule_doc' into 'master' | Achilleas Pipinellis | 2017-07-16 | 1 | -1/+6 |
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | Add AD matching rule filter and more information See merge request !12871 | ||||
| | * | | | Add AD matching rule filter and more informationad_matching_rule_doc | Drew Blessing | 2017-07-14 | 1 | -1/+6 |
| | | | | | |||||
* | | | | | Fix typos35129-update-prometheus-docs | Joshua Lambert | 2017-07-18 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Fix links | Joshua Lambert | 2017-07-16 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Doc updates for 9.4 | Joshua Lambert | 2017-07-16 | 3 | -0/+74 |
| | | | | | |||||
* | | | | | Prometheus doc updates for 9.4 | Joshua Lambert | 2017-07-16 | 6 | -34/+69 |
| | | | | | |||||
* | | | | | WIP | Joshua Lambert | 2017-07-14 | 2 | -0/+54 |
| | | | | | |||||
* | | | | | Prometheus docs WIP | Joshua Lambert | 2017-07-14 | 1 | -45/+16 |
|/ / / / | |||||
* | | | | Merge branch 'bjk/metric_names' into 'master' | Douwe Maan | 2017-07-14 | 1 | -15/+18 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Update metric names to match Prometheus guidelines. Closes #35031 See merge request !12812 | ||||
| * | | | Update sessions metric name. | Ben Kochie | 2017-07-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update metrics docs. | Ben Kochie | 2017-07-12 | 1 | -15/+18 |
| | | | | |||||
| * | | | Add unit to latency metrics. | Ben Kochie | 2017-07-12 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `seconds` unit to latency metrics based on uptream naming convention[0]. [0]: https://prometheus.io/docs/practices/naming/#metric-names | ||||
* | | | | Merge branch 'fixes-for-internal-auth-disabled' into 'master' | Sean McGivern | 2017-07-14 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fixes needed when GitLab sign-in is not enabled See merge request !12491 | ||||
| * | | | | Fixes needed when GitLab sign-in is not enabled | Robin Bobbitt | 2017-07-13 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When sign-in is disabled: - skip password expiration checks - prevent password reset requests - don’t show Password tab in User Settings - don’t allow login with username/password for Git over HTTP requests - render 404 on requests to Profiles::PasswordsController | ||||
* | | | | | Fixed typo | kamesh | 2017-07-14 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Add more notes about developer seeds | Lin Jen-Shin (godfat) | 2017-07-13 | 1 | -0/+50 |
| |_|_|/ |/| | | | |||||
* | | | | Deep link | Sid Sijbrandij | 2017-07-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | Update vue-resource | Filipa Lacerda | 2017-07-12 | 1 | -36/+83 |
| |/ / |/| | | |||||
* | | | Return `is_admin` attribute in the GET /user endpoint for admins | Rémy Coutable | 2017-07-12 | 1 | -1/+1 |
| |/ |/| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'sh-add-mr-simple-mode' into 'master' | Sean McGivern | 2017-07-11 | 1 | -0/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Add a simple mode to merge request API Closes #34920 See merge request !12766 | ||||
| * | | Use view=simple for simplifying merge requests API | Stan Hu | 2017-07-11 | 1 | -1/+1 |
| | | | |||||
| * | | Add a simple mode to merge request APIsh-add-mr-simple-mode | Stan Hu | 2017-07-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | The current "basic" merge request API still loads too much data. For integrations like the Trello Power-up, we just need the basics. Closes #34920 | ||||
* | | | Merge branch 'jej/create-update-instructions-for-9-4' into 'master' | Achilleas Pipinellis | 2017-07-11 | 1 | -12/+33 |
|\ \ \ | | | | | | | | | | | | | | | | | Update 9.4 update instructions to include changes made to 9.3 instructions See merge request !12781 | ||||
| * | | | 9.4 update instractions include changes made to 9.3 instructions | James Edwards-Jones | 2017-07-11 | 1 | -12/+33 |
| | | | | |||||
* | | | | Merge branch 'jej/update-source-install-instructions-for-9-4' into 'master' | Achilleas Pipinellis | 2017-07-11 | 1 | -2/+2 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Update source installation instructions for 9.4 See merge request !12779 | ||||
| * | | | Update source installation instructions for 9.4jej/update-source-install-instructions-for-9-4 | James Edwards-Jones | 2017-07-11 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge branch '33949-remove-healthcheck-access-token' into 'master' | Sean McGivern | 2017-07-11 | 1 | -6/+20 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Remove the need to use health check token by adding ability to whitelist hosts Closes #33949 See merge request !12612 | ||||
| * | | Differentiate shared test context using options hash instead of subject.33949-remove-healthcheck-access-token | Pawel Chojnacki | 2017-07-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | + fix typos, and capitalization + point configuration to `gitlab.rb` as well | ||||
| * | | Limit docs line lenght | Pawel Chojnacki | 2017-07-06 | 1 | -3/+4 |
| | | | |||||
| * | | Bring back healthcheck token access to monitoring resources, but mark this ↵ | Pawel Chojnacki | 2017-07-05 | 1 | -5/+18 |
| | | | | | | | | | | | | as deprecated |