summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove ToC and fix headings in Markdown docsdocs/markdownAchilleas Pipinellis2016-11-171-103/+53
| | | | [ci skip]
* Merge branch 'doc/sentinel' into 'master' Achilleas Pipinellis2016-11-163-196/+1169
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved redis sentinel documentation ## What does this MR do? Updates Redis Sentinel documentation (most Omnibus stuff). ## Are there points in the code the reviewer needs to double check? Grammar / Documentation ## Why was this MR needed? After this https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1000 get merged, people will need to follow new instructions. ## Checklist - Documentation follows Sentinel best-practices: - [x] Suggests amount of sentinel nodes - [x] Suggests amount of redis nodes - [x] Suggests quorum value according to recomended amount of sentinel nodes - [x] Describes how to define quorum according to best-practices - [x] Lists ports and firewall checklist - [x] Following Documentation bring us to a working environment - [ ] Documentation is clear and have no gramatical issue ## What are the relevant issue numbers? gitlab-org/omnibus-gitlab#1565 See merge request !6471
| * Minor edits in Redis HA source installAchilleas Pipinellis2016-11-161-4/+4
| | | | | | | | [ci skip]
| * Remove experimental heading and move note at the topAchilleas Pipinellis2016-11-161-9/+6
| | | | | | | | [ci skip]
| * Merge branch 'doc/sentinel' of gitlab.com:gitlab-org/gitlab-ce into doc/sentinelAchilleas Pipinellis2016-11-163-330/+1107
| |\
| | * Merge examples of Redis master/slave + Sentinels for source docsAchilleas Pipinellis2016-11-161-67/+106
| | | | | | | | | | | | [ci skip]
| | * Add steps to Redis HA source installationAchilleas Pipinellis2016-11-161-73/+123
| | |
| | * Merge examples of Redis master/slave + SentinelsAchilleas Pipinellis2016-11-161-107/+37
| | |
| | * Rearrange Redis HA source installations sectionsAchilleas Pipinellis2016-11-161-24/+33
| | |
| | * Add clear instructions for the different Redis HA setupsAchilleas Pipinellis2016-11-161-35/+40
| | |
| | * Refactor Redis HA docsAchilleas Pipinellis2016-11-151-233/+314
| | | | | | | | | | | | [ci skip]
| | * Swap HA setupsAchilleas Pipinellis2016-11-152-42/+45
| | |
| | * Add missing link to GH issueAchilleas Pipinellis2016-11-111-6/+9
| | |
| | * Rearrange sections in Sentinel docsAchilleas Pipinellis2016-11-101-162/+181
| | | | | | | | | | | | [ci skip]
| | * Move some things overAchilleas Pipinellis2016-11-101-83/+112
| | |
| | * Move experimental heading at the bottom under changelogAchilleas Pipinellis2016-11-101-26/+33
| | |
| | * Fix typos of Redis sentinel docsAchilleas Pipinellis2016-11-101-22/+22
| | |
| | * Remade documentation for Redis HA with OmnibusGabriel Mazetto2016-11-102-182/+480
| | |
| | * Fixed some documentation and moved Source install specific to other file.Gabriel Mazetto2016-11-082-121/+300
| | |
| | * Fixed documentation and added redis/sentinel roles instructionGabriel Mazetto2016-11-081-14/+54
| | |
| | * Few more fixes to Sentinel documentation to address MR feedbackGabriel Mazetto2016-11-081-7/+4
| | |
| | * Reduce the ammount of lines to disable services and update TOCGabriel Mazetto2016-11-081-9/+3
| | |
| | * Improved Redis HA and Sentinel documentation.Gabriel Mazetto2016-11-081-117/+210
| | |
| | * Improved documentation on HA sentinel part and Redis replication ↵Gabriel Mazetto2016-11-081-60/+256
| | | | | | | | | | | | troubleshooting.
| | * Updated password examples and improved omnibus troubleshootingGabriel Mazetto2016-11-081-4/+19
| | |
| | * Small fixes on Sentinel documentation for CEGabriel Mazetto2016-11-081-2/+0
| | |
| | * Improved redis sentinel documentation for CEGabriel Mazetto2016-11-081-36/+26
| | |
| * | Improved documentation on HA sentinel part and Redis replication ↵Gabriel Mazetto2016-11-161-60/+256
| | | | | | | | | | | | troubleshooting.
| * | Updated password examples and improved omnibus troubleshootingGabriel Mazetto2016-11-161-4/+19
| | |
| * | Small fixes on Sentinel documentation for CEGabriel Mazetto2016-11-161-2/+0
| | |
| * | Improved redis sentinel documentation for CEGabriel Mazetto2016-11-161-36/+26
|/ /
* | Merge branch 'fix_navigation_bar_issuables_counters' into 'master' Rémy Coutable2016-11-164-2/+61
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Navigation bar issuables counters reflects dashboard issuables counters Adds a 2 minute cache on navigation bar issuables counters. The counters on dashboard/issues and dashboard/merge_requests are cached while the navigation bar issuables counters were not. Users read incoherent issuables count throughout the application. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23882 See merge request !7368
| * | Refactor issuables_counter_spec.Lucas Deschamps2016-11-161-23/+17
| | |
| * | Improve issuables_counter_spec relevance.Lucas Deschamps2016-11-161-8/+25
| | |
| * | Improve changes after MR review.Lucas Deschamps2016-11-163-4/+4
| | |
| * | Navigation bar issuables counters reflects dashboard issuables countersLucas Deschamps2016-11-164-2/+50
| | |
* | | Merge branch 'rs-disable-changelog-merge' into 'master' Dmitriy Zaporozhets2016-11-161-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove gitattribute entry for CHANGELOG.md This should no longer be necessary now that we've got automatic changelogs! See merge request !7479
| * | | Remove gitattribute entry for CHANGELOG.mdrs-disable-changelog-mergeRobert Speicher2016-11-151-1/+0
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge branch '22680-unlabel-limit-autocomplete-to-selected-items' into 'master' Rémy Coutable2016-11-164-2/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit autocomplete to currently selected items When using the /unlabel command the autocomplete list of labels is now limited to the list of labels currently assigned to the issue. Closes #22680 See merge request !6796
| * | | | Limit autocomplete to currently selected itemsAkram FARES2016-11-154-2/+21
| | | | |
* | | | | Merge branch 'refactor-issuable-title-form' into 'master' Rémy Coutable2016-11-163-52/+53
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move issuable title form to a new partial Continue to refactor issuable form view (after !7249). Part of #23864. See merge request !7453
| * | | | Move issuable title form to a new partialRémy Coutable2016-11-163-52/+53
|/ / / / | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '22790-mention-autocomplete-avatar' into 'master' Alfredo Sumaran2016-11-155-10/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User avatar in mention autocomplete in comment box ## What does this MR do? This MR shows avatar in `@<username>` autocomplete in comment box. Also shows first latter as avatar if there is no group avatar is available. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? This MR closes issue #22790 ## Screenshots (if relevant) **Before** ![Screen_Shot_2016-10-25_at_17.44.44](/uploads/c44de668c7a2d482594423ebcc917440/Screen_Shot_2016-10-25_at_17.44.44.png) **After** ![mention-avatar](/uploads/7cd2fbefa42e4a5f14335e057cf6978a/mention-avatar.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22790 See merge request !6865
| * | | | shows user avatar in mention autocomplete in editor22790-mention-autocomplete-avatarNur Rony2016-11-165-10/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds entry in CHANGELOG no uninitialized variable and unnecessary if statement formatting issue in CHANGELOG resolves scss lint warings cleanup: unnecessary css classes adds css class that cleaned up by mistake replaces snake_case variables name with camelCase removes unnecessary css class and adds white color border for avatar moves changelog entry from 8.13 to 8.14 remove bottom margin from avatar-inline resolves lint warnings rebased and moves changelog entry to 8.14 fixes avatar shifting on hover adds entry at top of 8.14 section in CHANGELOG.md calls sanitization for gl.utils syncing changelog with master and created changelog files using cli changes changelog title
* | | | | Merge branch 'copy-messaging-guidelines' into 'master' Allison Whilden2016-11-156-0/+83
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Copy messaging guidelines Update documentation to start having consistency and guidelines for copy (messaging) in GitLab. See merge request !7467
| * | | | [ci skip] Link to the copy (messaging) page.Victor Wu2016-11-156-0/+83
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new file for copy (messaging) guidelines Update copy guidelines Fix typo Add forms to guidelines Simplify Copy heading Refine copy page. Add images and table Fix toc link on Copy page
* | | | Merge branch 'fix_ldap_docs' into 'master' Drew Blessing2016-11-151-0/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify LDAP troubleshooting ldap_search example A customer noted an error/lack of clarity in the LDAP documentation with the `ldap_search` example. Previously, if taken literally, the customer may have expected the `$` variables to be automatically replaced or if they paste the exact `user_filter` contents the parentheses would have been incorrect. Let's just simply the filter and use exactly what's in the configuration. See merge request !7489
| * | | | Clarify LDAP troubleshooting ldap_search example [ci skip]Drew Blessing2016-11-151-0/+18
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A customer noted an error/lack of clarity in the LDAP documentation with the `ldap_search` example. Previously, if taken literally, the customer may have expected the `$` variables to be automatically replaced or if they paste the exact `user_filter` contents the parentheses would have been incorrect. Let's just simply the filter and use exactly what's in the configuration.
* | | | Merge branch 'patch-9' into 'master' Sean McGivern2016-11-151-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix invalid JSON in Builds API doc See merge request !7475
| * | | | Fix invalid JSON in Builds API doc Bernhard Häussner2016-11-151-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The JSON of the example responses were missing a few `,` and therefor invalid. This adds them to make those JSONs valid.