summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Escape JavaScript in haml template.category-search-dropdownFatih Acet2016-06-141-6/+6
* Defensive check for the group options.Fatih Acet2016-06-131-1/+1
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search...Fatih Acet2016-06-13480-991/+2497
|\
| * Merge branch 'cache-apt-and-ruby-only' into 'master' Rémy Coutable2016-06-132-3/+4
| |\
| | * Cache only apt and ruby from vendorcache-apt-and-ruby-onlyKamil Trzcinski2016-06-122-3/+4
| * | Merge branch 'instrument-reference-parsers' into 'master' Rémy Coutable2016-06-132-6/+12
| |\ \
| | * | Instrument all Banzai::ReferenceParser classesinstrument-reference-parsersYorick Peterse2016-06-132-6/+12
| * | | Merge branch 'doc-styleguide-move-locations' into 'master' Achilleas Pipinellis2016-06-131-0/+42
| |\ \ \
| | * | | Add guide on changing a document's locationAchilleas Pipinellis2016-06-131-0/+42
| * | | | Merge branch 'fix-notes-doc-styleguide' into 'master' Achilleas Pipinellis2016-06-131-5/+5
| |\ \ \ \
| | * | | | Change to new Notes styleguideAchilleas Pipinellis2016-06-131-5/+5
| | |/ / /
| * | | | Merge branch 'fix-migration-helper-race-conditions' into 'master' Rémy Coutable2016-06-132-6/+20
| |\ \ \ \
| | * | | | Removed old comment from update_column_in_batchesfix-migration-helper-race-conditionsYorick Peterse2016-06-131-2/+0
| | * | | | Update columns in batches until no rows are leftYorick Peterse2016-06-131-2/+5
| | * | | | Handle NULL migration errors in migration helpersYorick Peterse2016-06-132-2/+15
| | | |/ / | | |/| |
| * | | | Merge branch '18377-cherry-pick-crashes-when-choosing-a-tag' into 'master' Rémy Coutable2016-06-134-1/+7
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Only show branches for revert / cherry-pick18377-cherry-pick-crashes-when-choosing-a-tagSean McGivern2016-06-134-1/+7
| * | | | Merge branch 'move-logs-doc-to-administration' into 'master' Achilleas Pipinellis2016-06-131-1/+1
| |\ \ \ \
| | * | | | Change logs.md location in READMEAchilleas Pipinellis2016-06-131-1/+1
| * | | | | Merge branch 'move-logs-doc-to-administration' into 'master' Achilleas Pipinellis2016-06-132-92/+138
| |\ \ \ \ \ | | |/ / / /
| | * | | | Move logs/logs.md to administration/logs.mdAchilleas Pipinellis2016-06-132-92/+138
| | | |/ / | | |/| |
| * | | | Merge branch 'issue_3359_2' into 'master' Douwe Maan2016-06-1314-64/+392
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Remove notification level fild from users, improve migrations and specsissue_3359_2Felipe Artur2016-06-109-57/+55
| | * | | Remove notification level from user modelFelipe Artur2016-06-1013-61/+391
| * | | | Merge branch '18446-when-this-merge-request-is-accepted-this-issue-will-be-cl...Rémy Coutable2016-06-135-9/+7
| |\ \ \ \
| | * | | | Don't try to count a relation with aliases18446-when-this-merge-request-is-accepted-this-issue-will-be-closed-automatically-rendered-twiceSean McGivern2016-06-104-7/+7
| | * | | | Only show issues closing MR when presentSean McGivern2016-06-101-2/+0
| | |/ / /
| * | | | Merge branch 'bug/svg_sanitizer' into 'master' Robert Speicher2016-06-133-13/+130
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Improved SVG sanitizer specs to include smoke tests for clean.bug/svg_sanitizerGabriel Mazetto2016-06-121-0/+16
| | * | | Refactored SVG sanitizerGabriel Mazetto2016-06-122-24/+41
| | * | | Added SVG sanitizer fix to the changelogGabriel Mazetto2016-06-121-0/+1
| | * | | Refactor SVG sanitizer and prevent `xlink:href` to refer to external resourcesGabriel Mazetto2016-06-122-8/+30
| | * | | Fix SVG whitelisting to allow namespaced attributesGabriel Mazetto2016-06-122-5/+66
| |/ / /
| * | | Merge branch 'fix-closes-issues-error-500' into 'master' Robert Speicher2016-06-126-2/+42
| |\ \ \
| | * | | Fix Error 500 when using closes_issues API with an external issue trackerStan Hu2016-06-116-2/+42
| * | | | Merge branch 'nav-offscreen-dz-patch' into 'master' Dmitriy Zaporozhets2016-06-115-27/+3
| |\ \ \ \
| | * | | | Center layout navigation and remove iconsnav-offscreen-dz-patchDmitriy Zaporozhets2016-06-115-27/+3
| * | | | | Merge branch '18417-nav-offscreen' into 'master' Dmitriy Zaporozhets2016-06-1118-182/+130
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix preferences_spec test18417-nav-offscreenAnnabel Dunstone2016-06-103-8/+6
| | * | | | Add back sidebar counters and usernameAnnabel Dunstone2016-06-109-15/+33
| | * | | | Fix safari logo loading animation safari bugAnnabel Dunstone2016-06-102-8/+1
| | * | | | Revert side nav to full width; remove border under nav; remove tooltips on na...Annabel Dunstone2016-06-1012-145/+52
| | * | | | Update media queriesAnnabel Dunstone2016-06-101-3/+3
| | * | | | Fix profile testAnnabel Dunstone2016-06-102-1/+2
| | * | | | Fix logo at all screen widths, update sidebar textAnnabel Dunstone2016-06-107-56/+78
| | * | | | Move tanuki icon to center of nav bar; keep nav closed by default; remove col...Annabel Dunstone2016-06-108-36/+44
| * | | | | Merge branch '18463-search-form-padding-is-too-damn-high' into 'master' Dmitriy Zaporozhets2016-06-111-1/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fixed search form paddingLuke "Jared" Bennett2016-06-101-1/+0
| * | | | | Merge branch 'create-backup-dir-for-local' into 'master' Robert Speicher2016-06-101-3/+18
| |\ \ \ \ \
| | * | | | | Only create the backup directory if it is localStan Hu2016-06-101-3/+18