Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update CHANGELOGremove-deprecated-issues-tracker-columns-from-projects | Douglas Barbosa Alexandre | 2016-06-13 | 1 | -0/+1 |
* | Remove deprecated issues_tracker and issues_tracker_id from project | Douglas Barbosa Alexandre | 2016-06-13 | 7 | -63/+12 |
* | Merge branch 'fix-schema' into 'master' | Robert Speicher | 2016-06-13 | 1 | -4/+3 |
|\ | |||||
| * | Schema doesn’t reflect the changes of the last 3 migrations | Douglas Barbosa Alexandre | 2016-06-13 | 1 | -4/+3 |
|/ | |||||
* | Merge branch 'dz-cleanup-counters' into 'master' | Dmitriy Zaporozhets | 2016-06-13 | 1 | -2/+0 |
|\ | |||||
| * | Remove counters from Pipeline navigationdz-cleanup-counters | Dmitriy Zaporozhets | 2016-06-13 | 1 | -2/+0 |
* | | Merge branch 'gitlab-auth-method-names' into 'master' | Douwe Maan | 2016-06-13 | 8 | -22/+22 |
|\ \ | |||||
| * | | Also rename "find" in the specs | Jacob Vosmaer | 2016-06-13 | 1 | -5/+5 |
| * | | Improve Gitlab::Auth method names | Jacob Vosmaer | 2016-06-10 | 8 | -17/+17 |
* | | | Merge branch 'style/enable-multiline-block-chain-rubocop-cop' into 'master' | Robert Speicher | 2016-06-13 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Enable Style/MultilineBlockChain rubocop style copstyle/enable-multiline-block-chain-rubocop-cop | Grzegorz Bizon | 2016-06-10 | 1 | -1/+1 |
* | | | | Merge branch 'upgrade-brakeman' into 'master' | Robert Speicher | 2016-06-13 | 2 | -24/+6 |
|\ \ \ \ | |||||
| * | | | | Update brakeman from 3.2.1 to 3.3.2 | Connor Shea | 2016-06-12 | 2 | -24/+6 |
* | | | | | Merge branch 'fix-related-branches-error-500' into 'master' | Kamil Trzciński | 2016-06-13 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix typo causing related branches to Error 500fix-related-branches-error-500 | Stan Hu | 2016-06-12 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'fix-bulk-assign-labels' into 'master' | Jacob Schatz | 2016-06-13 | 2 | -4/+30 |
|\ \ \ \ \ | |||||
| * | | | | | Fixes a bug when assigning a label to multiple issuesfix-bulk-assign-labels | Alfredo Sumaran | 2016-06-10 | 2 | -4/+30 |
* | | | | | | Merge branch 'artifacts-when' into 'master' | Rémy Coutable | 2016-06-13 | 4 | -1/+78 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into artifacts-when | Kamil Trzcinski | 2016-06-13 | 605 | -1418/+3670 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'cache-apt-and-ruby-only' into 'master' | Rémy Coutable | 2016-06-13 | 2 | -3/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Cache only apt and ruby from vendorcache-apt-and-ruby-only | Kamil Trzcinski | 2016-06-12 | 2 | -3/+4 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'instrument-reference-parsers' into 'master' | Rémy Coutable | 2016-06-13 | 2 | -6/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Instrument all Banzai::ReferenceParser classesinstrument-reference-parsers | Yorick Peterse | 2016-06-13 | 2 | -6/+12 |
* | | | | | | | | Merge branch 'doc-styleguide-move-locations' into 'master' | Achilleas Pipinellis | 2016-06-13 | 1 | -0/+42 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add guide on changing a document's location | Achilleas Pipinellis | 2016-06-13 | 1 | -0/+42 |
* | | | | | | | | | Merge branch 'fix-notes-doc-styleguide' into 'master' | Achilleas Pipinellis | 2016-06-13 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Change to new Notes styleguide | Achilleas Pipinellis | 2016-06-13 | 1 | -5/+5 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'fix-migration-helper-race-conditions' into 'master' | Rémy Coutable | 2016-06-13 | 2 | -6/+20 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Removed old comment from update_column_in_batchesfix-migration-helper-race-conditions | Yorick Peterse | 2016-06-13 | 1 | -2/+0 |
| * | | | | | | | | | Update columns in batches until no rows are left | Yorick Peterse | 2016-06-13 | 1 | -2/+5 |
| * | | | | | | | | | Handle NULL migration errors in migration helpers | Yorick Peterse | 2016-06-13 | 2 | -2/+15 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch '18377-cherry-pick-crashes-when-choosing-a-tag' into 'master' | Rémy Coutable | 2016-06-13 | 4 | -1/+7 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Only show branches for revert / cherry-pick18377-cherry-pick-crashes-when-choosing-a-tag | Sean McGivern | 2016-06-13 | 4 | -1/+7 |
* | | | | | | | | | Merge branch 'move-logs-doc-to-administration' into 'master' | Achilleas Pipinellis | 2016-06-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Change logs.md location in README | Achilleas Pipinellis | 2016-06-13 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'move-logs-doc-to-administration' into 'master' | Achilleas Pipinellis | 2016-06-13 | 2 | -92/+138 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Move logs/logs.md to administration/logs.md | Achilleas Pipinellis | 2016-06-13 | 2 | -92/+138 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'issue_3359_2' into 'master' | Douwe Maan | 2016-06-13 | 14 | -64/+392 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Remove notification level fild from users, improve migrations and specsissue_3359_2 | Felipe Artur | 2016-06-10 | 9 | -57/+55 |
| * | | | | | | | | Remove notification level from user model | Felipe Artur | 2016-06-10 | 13 | -61/+391 |
* | | | | | | | | | Merge branch '18446-when-this-merge-request-is-accepted-this-issue-will-be-cl... | Rémy Coutable | 2016-06-13 | 5 | -9/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Don't try to count a relation with aliases18446-when-this-merge-request-is-accepted-this-issue-will-be-closed-automatically-rendered-twice | Sean McGivern | 2016-06-10 | 4 | -7/+7 |
| * | | | | | | | | | Only show issues closing MR when present | Sean McGivern | 2016-06-10 | 1 | -2/+0 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'bug/svg_sanitizer' into 'master' | Robert Speicher | 2016-06-13 | 3 | -13/+130 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Improved SVG sanitizer specs to include smoke tests for clean.bug/svg_sanitizer | Gabriel Mazetto | 2016-06-12 | 1 | -0/+16 |
| * | | | | | | | | Refactored SVG sanitizer | Gabriel Mazetto | 2016-06-12 | 2 | -24/+41 |
| * | | | | | | | | Added SVG sanitizer fix to the changelog | Gabriel Mazetto | 2016-06-12 | 1 | -0/+1 |
| * | | | | | | | | Refactor SVG sanitizer and prevent `xlink:href` to refer to external resources | Gabriel Mazetto | 2016-06-12 | 2 | -8/+30 |
| * | | | | | | | | Fix SVG whitelisting to allow namespaced attributes | Gabriel Mazetto | 2016-06-12 | 2 | -5/+66 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'fix-closes-issues-error-500' into 'master' | Robert Speicher | 2016-06-12 | 6 | -2/+42 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | |