Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix incorrect AWS ELB metrics.35174-fix-aws-elb-query | Joshua Lambert | 2017-07-17 | 1 | -1/+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 |
| |/ | |||||
* | | Merge branch 'docs/overview-features-3' into 'master' | Achilleas Pipinellis | 2017-07-16 | 3 | -10/+29 |
|\ \ | | | | | | | | | | | | | Update issue-related docs See merge request !12881 | ||||
| * | | Update issue-related docs | Marcia Ramos | 2017-07-16 | 3 | -10/+29 |
|/ / | |||||
* | | Merge branch 'docs/add-features-groups' into 'master' | Achilleas Pipinellis | 2017-07-16 | 30 | -150/+214 |
|\ \ | | | | | | | | | | | | | Refactor groups docs See merge request !12888 | ||||
| * | | Refactor groups docs | Marcia Ramos | 2017-07-16 | 30 | -150/+214 |
|/ / | |||||
* | | Merge branch 'docs/add-subgroups-limitations-to-pages' into 'master' | Achilleas Pipinellis | 2017-07-16 | 2 | -7/+15 |
|\ \ | | | | | | | | | | | | | | | | | | | Add subgroups limitations to Pages docs Closes #34621 See merge request !12891 | ||||
| * | | 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 |
| | | | |||||
* | | | Merge branch ↵ | Annabel Dunstone Gray | 2017-07-14 | 2 | -9/+9 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35069-stop-using-rgba-for-text-color-as-it-leads-to-worse-readability-on-non-retina-screens' into 'master' Resolve "Stop using RGBA for text color as it leads to worse readability on non-retina screens" Closes #35069 See merge request !12873 | ||||
| * | | | Change text colors from RGBA to HEX35069-stop-using-rgba-for-text-color-as-it-leads-to-worse-readability-on-non-retina-screens | Pedro Moreira da Silva | 2017-07-14 | 2 | -9/+9 |
| | | | | |||||
* | | | | Merge branch 'fix-javascript-test-coverage-badge' into 'master' | Clement Ho | 2017-07-14 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix javascript test coverage badge in README.md See merge request !12878 | ||||
| * | | | | fix javascript test coverage badge in README.mdfix-javascript-test-coverage-badge | Mike Greiling | 2017-07-14 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'bjk/metric_names' into 'master' | Douwe Maan | 2017-07-14 | 11 | -112/+93 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update metric names to match Prometheus guidelines. Closes #35031 See merge request !12812 | ||||
| * | | | | | Rename ConnectionRackMiddleware to RequestsRackMiddleware.bjk/metric_names | Pawel Chojnacki | 2017-07-13 | 4 | -60/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | + fix tests after metrics rename | ||||
| * | | | | | Update sessions metric name. | Ben Kochie | 2017-07-12 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Update metrics docs. | Ben Kochie | 2017-07-12 | 1 | -15/+18 |
| | | | | | | |||||
| * | | | | | Add unit to latency metrics. | Ben Kochie | 2017-07-12 | 6 | -29/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `seconds` unit to latency metrics based on uptream naming convention[0]. [0]: https://prometheus.io/docs/practices/naming/#metric-names | ||||
| * | | | | | Update rack metric names | Ben Kochie | 2017-07-12 | 2 | -21/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Follow Prometheus naming conventions[0]. * Simplify metrics by adding response lables to the histogram. * Use standard `http_request_duration_seconds_...` names for the histogram. [0]: https://prometheus.io/docs/practices/naming/#metric-names | ||||
* | | | | | | Merge branch ↵ | Sean McGivern | 2017-07-14 | 5 | -6/+25 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix-exact-matches-of-username-and-email-on-top-of-the-user-search' into 'master' Fixes the user order being overriden in the autocomplete controller See merge request !12868 | ||||
| * | | | | | | Fixes the user order being overriden in the autocomplete controllerfix-exact-matches-of-username-and-email-on-top-of-the-user-search | Tiago Botelho | 2017-07-14 | 5 | -6/+25 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'changes_in_msgid_in_synchronization_gitlab.pot' into 'master' | Sean McGivern | 2017-07-14 | 7 | -23/+23 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in msgid in synchronization gitlab.pot See merge request !12861 | ||||
| * | | | | | | | changes in msgid in synchronization gitlab.pot | 黄涛 | 2017-07-14 | 7 | -23/+23 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'pass-before-script-as-is' into 'master' | Grzegorz Bizon | 2017-07-14 | 5 | -25/+80 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass before_script and script as-is preserving arrays See merge request !12680 | ||||
| * | | | | | | | | Pass before_script and script as-is preserving arrayspass-before-script-as-is | Kamil Trzcinski | 2017-07-07 | 5 | -25/+80 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '34075-pipelines-count-mt' into 'master' | Phil Hughes | 2017-07-14 | 10 | -18/+94 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Pipeline's badge count in Merge Request and Commits view to match real-time content Closes #34075 See merge request !12789 | ||||
| * | | | | | | | | Update Pipeline's badge count in Merge Request and Commits view to match ↵ | Filipa Lacerda | 2017-07-14 | 10 | -18/+94 |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | real-time content | ||||
* | | | | | | | | Merge branch 'fix/gb/recover-from-renaming-project-with-container-images' ↵ | Sean McGivern | 2017-07-14 | 7 | -38/+117 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Recover from renaming project that has container images Closes #23019 See merge request !12840 | ||||
| * | | | | | | | | Implement memoization in project correctly this timefix/gb/recover-from-renaming-project-with-container-images | Grzegorz Bizon | 2017-07-14 | 1 | -1/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove one assertion from projects controller specs | Grzegorz Bizon | 2017-07-14 | 1 | -3/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Memoize result of checking container images on project | Grzegorz Bizon | 2017-07-14 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Add changelog for renaming project with images fix | Grzegorz Bizon | 2017-07-14 | 1 | -0/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Adds specs for renaming a project with container images | Grzegorz Bizon | 2017-07-14 | 1 | -0/+15 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix rubocop offense in projects controller specs | Grzegorz Bizon | 2017-07-14 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Add specs for changing default branch in a project | Grzegorz Bizon | 2017-07-14 | 2 | -10/+26 |
| | | | | | | | | | |||||
| * | | | | | | | | Recover from renaming project that has container images | Grzegorz Bizon | 2017-07-13 | 6 | -29/+72 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'refactor-user-bundle' into 'master' | Clement Ho | 2017-07-14 | 8 | -242/+240 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor user bundle See merge request !12728 | ||||
| * | | | | | | | | Refactor user bundle | Mike Greiling | 2017-07-14 | 8 | -242/+240 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch ↵ | Grzegorz Bizon | 2017-07-14 | 2 | -9/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/32032-remove-the-rest-of-trigger_schedule-related-codes' into 'master' Remove the rest of `trigger_schedule` related codes Closes #32032 See merge request !12839 | ||||
| * | | | | | | | | Remove trigger_schedule_attributes and factory :ci_trigger_for_trigger_schedulefix/sm/32032-remove-the-rest-of-trigger_schedule-related-codes | Shinya Maeda | 2017-07-13 | 2 | -9/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '19629-remove-inactive-tokens-list' into 'master' | Filipa Lacerda | 2017-07-14 | 4 | -29/+18 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Inactive Personal Access Tokens list from Access Tokens page Closes #19629 See merge request !12866 |