summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into remove-comment-...remove-comment-toggleFatih Acet2016-06-141851-12220/+33762
|\
| * Merge branch 'fix-schema' into 'master' Robert Speicher2016-06-131-4/+3
| |\
| | * Schema doesn’t reflect the changes of the last 3 migrationsDouglas Barbosa Alexandre2016-06-131-4/+3
| |/
| * Merge branch 'dz-cleanup-counters' into 'master' Dmitriy Zaporozhets2016-06-131-2/+0
| |\
| | * Remove counters from Pipeline navigationdz-cleanup-countersDmitriy Zaporozhets2016-06-131-2/+0
| * | Merge branch 'gitlab-auth-method-names' into 'master' Douwe Maan2016-06-138-22/+22
| |\ \
| | * | Also rename "find" in the specsJacob Vosmaer2016-06-131-5/+5
| | * | Improve Gitlab::Auth method namesJacob Vosmaer2016-06-108-17/+17
| * | | Merge branch 'style/enable-multiline-block-chain-rubocop-cop' into 'master' Robert Speicher2016-06-131-1/+1
| |\ \ \
| | * | | Enable Style/MultilineBlockChain rubocop style copstyle/enable-multiline-block-chain-rubocop-copGrzegorz Bizon2016-06-101-1/+1
| * | | | Merge branch 'upgrade-brakeman' into 'master' Robert Speicher2016-06-132-24/+6
| |\ \ \ \
| | * | | | Update brakeman from 3.2.1 to 3.3.2Connor Shea2016-06-122-24/+6
| * | | | | Merge branch 'fix-related-branches-error-500' into 'master' Kamil Trzciński2016-06-131-1/+1
| |\ \ \ \ \
| | * | | | | Fix typo causing related branches to Error 500fix-related-branches-error-500Stan Hu2016-06-121-1/+1
| | |/ / / /
| * | | | | Merge branch 'fix-bulk-assign-labels' into 'master' Jacob Schatz2016-06-132-4/+30
| |\ \ \ \ \
| | * | | | | Fixes a bug when assigning a label to multiple issuesfix-bulk-assign-labelsAlfredo Sumaran2016-06-102-4/+30
| * | | | | | Merge branch 'artifacts-when' into 'master' Rémy Coutable2016-06-134-1/+78
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into artifacts-whenKamil Trzcinski2016-06-13605-1418/+3670
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | 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
| | | |_|_|/ / / | | |/| | | | |