summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Change last_used_at to use touchchat-name-authorizeKamil Trzcinski2016-11-171-1/+1
* Add chat_name partialKamil Trzcinski2016-11-173-30/+30
* Fix code reviewKamil Trzcinski2016-11-171-1/+1
* Fix code review style issuesKamil Trzcinski2016-11-172-2/+2
* Add specs for testing authorization and deny of chat userKamil Trzcinski2016-11-162-0/+81
* Improve code design after code reviewKamil Trzcinski2016-11-1611-21/+24
* Fix `chat_names` before_actionKamil Trzcinski2016-11-161-1/+1
* Merge remote-tracking branch 'origin/master' into chat-name-authorizeKamil Trzcinski2016-11-16399-10789/+12400
|\
| * Merge branch 'doc/sentinel' into 'master' Achilleas Pipinellis2016-11-163-196/+1169
| |\
| | * Minor edits in Redis HA source installAchilleas Pipinellis2016-11-161-4/+4
| | * Remove experimental heading and move note at the topAchilleas Pipinellis2016-11-161-9/+6
| | * 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
| | | * 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
| | | * 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
| | | * 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 troubleshoot...Gabriel Mazetto2016-11-081-60/+256
| | | * 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 troubleshoot...Gabriel Mazetto2016-11-161-60/+256
| | * | 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
| |\ \
| | * | 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.mdrs-disable-changelog-mergeRobert Speicher2016-11-151-1/+0
| * | | | Merge branch '22680-unlabel-limit-autocomplete-to-selected-items' into 'master' Rémy Coutable2016-11-164-2/+21
| |\ \ \ \
| | * | | | 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 partialRémy Coutable2016-11-163-52/+53
| |/ / / /
| * | | | Merge branch '22790-mention-autocomplete-avatar' into 'master' Alfredo Sumaran2016-11-155-10/+40
| |\ \ \ \