summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed issue with user calendar colorscontrib-calendar-colorsPhil Hughes2016-06-131-11/+6
* 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
* | | | Merge branch 'finding-multiple-projects-by-paths' into 'master' Robert Speicher2016-06-102-11/+93
|\ \ \ \ | |/ / / |/| | |
| * | | Add Project.where_paths_infinding-multiple-projects-by-pathsYorick Peterse2016-06-102-11/+93
* | | | Merge branch 'changelog-search-arrow-keys' into 'master' Robert Speicher2016-06-101-1/+1
|\ \ \ \
| * | | | Changelog fix for search dropdown arrow keys fixchangelog-search-arrow-keysPhil Hughes2016-06-101-1/+1
* | | | | Merge branch '18462-remove-unused-mergerequest-gitlab_merge_status-method' in...Robert Speicher2016-06-101-8/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove unused MergeRequest#gitlab_merge_status methodRémy Coutable2016-06-101-8/+0
* | | | | Merge branch 'labels-placement' into 'master' Dmitriy Zaporozhets2016-06-1011-105/+127
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add CHANGELOG item for labels/milestones navigation changeDmitriy Zaporozhets2016-06-101-0/+1
| * | | | Render issues link on issues subnav unless you visit merge request controllerDmitriy Zaporozhets2016-06-101-1/+1
| * | | | Render only issues/mr in subnav depends on contextDmitriy Zaporozhets2016-06-105-17/+21
| * | | | Move Labels and Milestones as sub tab to Issues/MRDmitriy Zaporozhets2016-06-107-90/+107
* | | | | Merge branch 'workhorse-helpers' into 'master' Robert Speicher2016-06-1014-34/+61
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Satisfy Rubocopworkhorse-helpersDouwe Maan2016-06-101-2/+2
| * | | | Merge branch 'master' into workhorse-helpersDouwe Maan2016-06-10175-950/+2237
| |\ \ \ \ | | |/ / /
| * | | | Add send_git_diff helperDouwe Maan2016-06-08231-2052/+5316
| |\ \ \ \
| * | | | | Move changelog itemDouwe Maan2016-06-061-1/+1
| * | | | | Add changelog itemDouwe Maan2016-06-061-0/+1
| * | | | | Add workhorse controller and API helpersDouwe Maan2016-06-0612-24/+45
* | | | | | Merge branch 'ci-page-ui-update' into 'master' Jacob Schatz2016-06-1016-247/+305
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Updated testsci-page-ui-updatePhil Hughes2016-06-101-1/+1
| * | | | | Fixed merge conflict that caused tests to fail with buildPhil Hughes2016-06-101-1/+1
| * | | | | Fixed failing testsPhil Hughes2016-06-101-2/+4
| * | | | | CI build page UI updatePhil Hughes2016-06-1016-250/+306
* | | | | | Merge branch 'icon-color-fix' into 'master' Jacob Schatz2016-06-102-8/+8
|\ \ \ \ \ \
| * | | | | | Update activity SVG pathicon-color-fixAnnabel Dunstone2016-06-092-8/+8
* | | | | | | Merge branch 'prettier-awardable-button-active' into 'master' Jacob Schatz2016-06-101-1/+9
|\ \ \ \ \ \ \
View Lorry Controller Status