Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Fix Error 500 when using closes_issues API with an external issue tracker | Stan Hu | 2016-06-11 | 6 | -2/+42 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'nav-offscreen-dz-patch' into 'master' | Dmitriy Zaporozhets | 2016-06-11 | 5 | -27/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Center layout navigation and remove iconsnav-offscreen-dz-patch | Dmitriy Zaporozhets | 2016-06-11 | 5 | -27/+3 | |
* | | | | | | | | | | Merge branch '18417-nav-offscreen' into 'master' | Dmitriy Zaporozhets | 2016-06-11 | 18 | -182/+130 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Fix preferences_spec test18417-nav-offscreen | Annabel Dunstone | 2016-06-10 | 3 | -8/+6 | |
| * | | | | | | | | | Add back sidebar counters and username | Annabel Dunstone | 2016-06-10 | 9 | -15/+33 | |
| * | | | | | | | | | Fix safari logo loading animation safari bug | Annabel Dunstone | 2016-06-10 | 2 | -8/+1 | |
| * | | | | | | | | | Revert side nav to full width; remove border under nav; remove tooltips on na... | Annabel Dunstone | 2016-06-10 | 12 | -145/+52 | |
| * | | | | | | | | | Update media queries | Annabel Dunstone | 2016-06-10 | 1 | -3/+3 | |
| * | | | | | | | | | Fix profile test | Annabel Dunstone | 2016-06-10 | 2 | -1/+2 | |
| * | | | | | | | | | Fix logo at all screen widths, update sidebar text | Annabel Dunstone | 2016-06-10 | 7 | -56/+78 | |
| * | | | | | | | | | Move tanuki icon to center of nav bar; keep nav closed by default; remove col... | Annabel Dunstone | 2016-06-10 | 8 | -36/+44 | |
* | | | | | | | | | | Merge branch '18463-search-form-padding-is-too-damn-high' into 'master' | Dmitriy Zaporozhets | 2016-06-11 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Fixed search form padding | Luke "Jared" Bennett | 2016-06-10 | 1 | -1/+0 | |
* | | | | | | | | | | Merge branch 'create-backup-dir-for-local' into 'master' | Robert Speicher | 2016-06-10 | 1 | -3/+18 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||||
| * | | | | | | | | | Only create the backup directory if it is local | Stan Hu | 2016-06-10 | 1 | -3/+18 | |
* | | | | | | | | | | Merge branch 'finding-multiple-projects-by-paths' into 'master' | Robert Speicher | 2016-06-10 | 2 | -11/+93 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Add Project.where_paths_infinding-multiple-projects-by-paths | Yorick Peterse | 2016-06-10 | 2 | -11/+93 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'changelog-search-arrow-keys' into 'master' | Robert Speicher | 2016-06-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Changelog fix for search dropdown arrow keys fixchangelog-search-arrow-keys | Phil Hughes | 2016-06-10 | 1 | -1/+1 | |
* | | | | | | | | | | Merge branch '18462-remove-unused-mergerequest-gitlab_merge_status-method' in... | Robert Speicher | 2016-06-10 | 1 | -8/+0 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Remove unused MergeRequest#gitlab_merge_status method | Rémy Coutable | 2016-06-10 | 1 | -8/+0 | |
* | | | | | | | | | | Merge branch 'labels-placement' into 'master' | Dmitriy Zaporozhets | 2016-06-10 | 11 | -105/+127 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Add CHANGELOG item for labels/milestones navigation change | Dmitriy Zaporozhets | 2016-06-10 | 1 | -0/+1 | |
| * | | | | | | | | | Render issues link on issues subnav unless you visit merge request controller | Dmitriy Zaporozhets | 2016-06-10 | 1 | -1/+1 | |
| * | | | | | | | | | Render only issues/mr in subnav depends on context | Dmitriy Zaporozhets | 2016-06-10 | 5 | -17/+21 | |
| * | | | | | | | | | Move Labels and Milestones as sub tab to Issues/MR | Dmitriy Zaporozhets | 2016-06-10 | 7 | -90/+107 |