summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Get mutual SSL working with helm tillerDylan Griffith2018-07-3019-59/+328
* Refactor Cluster Application classes to pass through a has of config filesDylan Griffith2018-07-2822-128/+122
* Merge branch 'sh-fix-karma-failures-icons' into 'master'Stan Hu2018-07-284-6/+6
|\
| * Fix Karma failures due to invalid icon namesStan Hu2018-07-274-6/+6
|/
* Merge branch '49681-dup-before-sanitize' into 'master'Stan Hu2018-07-271-1/+1
|\
| * tooltip_message is frozen so dup it before sanitizingLin Jen-Shin2018-07-271-1/+1
* | Update CHANGELOG.md for 11.1.3GitLab Release Tools Bot2018-07-2710-45/+18
* | Merge branch 'update-gitlab-shell' into 'master'Douwe Maan2018-07-271-1/+1
|\ \
| * | Update gitlab-shell version to 7.2.0James Lopez2018-07-271-1/+1
|/ /
* | Merge branch 'tc-reorder-mail-notify-references' into 'master'Douwe Maan2018-07-279-9/+14
|\ \
| * | Put fallback reply-key address first in the References headerToon Claes2018-07-279-9/+14
* | | Merge branch 'stop-dynamic-routable-creation' into 'master'Douwe Maan2018-07-2718-104/+314
|\ \ \
| * | | Remove code for dynamically generating routesstop-dynamic-routable-creationYorick Peterse2018-07-2517-104/+265
| * | | Remove orphaned routesYorick Peterse2018-07-251-0/+49
* | | | Revert "Merge branch '41416-making-instance-wide-data-tools-more-accessible' ...Sean McGivern2018-07-2738-295/+43
* | | | Merge branch '41416-making-instance-wide-data-tools-more-accessible' into 'ma...Sean McGivern2018-07-2738-43/+295
|\ \ \ \
| * | | | Add instance statistics settings to APIBob Van Landuyt2018-07-273-3/+10
| * | | | Update instance_statistics.html.hamlLuke Bennett2018-07-271-2/+2
| * | | | Update 41416-making-instance-wide-data-tools-more-accessible.ymlLuke Bennett2018-07-271-2/+1
| * | | | Remove instance statistics links from admin pagesBob Van Landuyt2018-07-271-10/+2
| * | | | Spec instance statisticsBob Van Landuyt2018-07-2711-15/+181
| * | | | correct instance statistics tooltipLuke Bennett2018-07-271-1/+1
| * | | | Move instance statistics icon left of admin wrenchLuke Bennett2018-07-271-6/+6
| * | | | Correct active page state for instance statisticsLuke Bennett2018-07-261-1/+1
| * | | | Add read_instance_statistics global policyLuke Bennett2018-07-264-10/+5
| * | | | Scope instance_statistics to dashLuke Bennett2018-07-262-2/+3
| * | | | schema.db updateLuke Bennett2018-07-261-0/+1
| * | | | add changelog entryLuke Bennett2018-07-261-0/+6
| * | | | Add instance_statistics_visibility_private application setting and top nav iconLuke Bennett2018-07-266-2/+33
| * | | | Create instance_statistics namespace and move convdev index and cohorts to itLuke Bennett2018-07-2621-19/+73
* | | | | Merge branch 'ce-7000-introduce-PolicyCheckable' into 'master'Grzegorz Bizon2018-07-274-4/+51
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Rename the module and add a simple test to checkLin Jen-Shin2018-07-273-2/+15
| * | | | Introduce PolicyCheckable for checking policiesce-7000-introduce-PolicyCheckableLin Jen-Shin2018-07-253-4/+38
* | | | | Merge branch '48567-the-comparison-list-for-the-modified-icons' into 'master'Phil Hughes2018-07-2712-17/+17
|\ \ \ \ \
| * | | | | Resolve "The comparison list for the modified icons"Sam Beckham2018-07-2712-17/+17
|/ / / / /
* | | | | Merge branch 'gitaly-mandatory-fetch-ref' into 'master'Sean McGivern2018-07-276-33/+17
|\ \ \ \ \
| * | | | | More Gitaly cleanup: fetch_ref, allow disk access blocksJacob Vosmaer (GitLab)2018-07-276-33/+17
|/ / / / /
* | | | | Merge branch 'rails5-update-gemfile-lock-2' into 'master'Rémy Coutable2018-07-272-6/+12
|\ \ \ \ \
| * | | | | Rails5 update Gemfile.rails5.lockJasper Maes2018-07-262-6/+12
* | | | | | Merge remote-tracking branch 'dev/master'Felipe Artur2018-07-2645-89/+303
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '48617-promoting-milestone' into 'master'Felipe Artur Cardozo2018-07-265-2/+41
| |\ \ \ \ \ \
| | * | | | | | Adds changelog entryFilipa Lacerda2018-07-171-0/+5
| | * | | | | | Escapes milestone and label names when promoting themFilipa Lacerda2018-07-174-5/+30
| | * | | | | | Escapes milestone title shown in flash message when promoting a milestoneFilipa Lacerda2018-07-132-2/+11
| * | | | | | | Merge branch 'security-ide-branch-name-xss' into 'master'Felipe Artur Cardozo2018-07-263-1/+15
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed XSS in branch name in Web IDEPhil Hughes2018-07-103-1/+15
| * | | | | | | | Merge branch 'security-2690-fix-tooltip' into 'master'Felipe Artur Cardozo2018-07-2612-38/+195
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Escapes job name used in tooltips in vue componentsFilipa Lacerda2018-07-0612-38/+195
| * | | | | | | | | Merge branch 'security-fj-missing-csrf-system-hooks' into 'master'Felipe Artur Cardozo2018-07-266-5/+10
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Changing the hook test action to use POSTFrancisco Javier López2018-07-236-5/+10
View Lorry Controller Status