summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'enable-scss-lint-bang-format' into 'master'Clement Ho2017-07-125-8/+8
|\
| * Enable BangFormat in scss-lintTakuya Noguchi2017-07-125-8/+8
* | Merge branch 'mr-branch-link-use-tree' into 'master'Robert Speicher2017-07-124-3/+14
|\ \
| * | Make commits behind text a link to the target branch commits pageClement Ho2017-07-114-3/+14
| * | Convert target branch link to use treeClement Ho2017-07-113-5/+5
| * | MR branch link now links to tree instead of commitsClement Ho2017-07-101-1/+1
* | | Merge branch 'enable-scss-lint-unnecessary-parent-reference' into 'master'Clement Ho2017-07-128-12/+12
|\ \ \
| * | | Enable UnnecessaryParentReference in scss-lintTakuya Noguchi2017-07-128-12/+12
* | | | Update vue-resourceFilipa Lacerda2017-07-1220-100/+91
* | | | Stop sanitizing user 'name' when inserting into dbNathan Neulinger2017-07-121-1/+1
* | | | Updated new navigation image in preferencesPhil Hughes2017-07-121-0/+0
* | | | Merge branch 'remove-nprogress-gleaning' into 'master'Clement Ho2017-07-121-6/+0
|\ \ \ \
| * | | | Remove CSS for nprogress removedTakuya Noguchi2017-07-121-6/+0
| |/ / /
* | | | Merge branch 'enable-scss-lint-import-path' into 'master'Clement Ho2017-07-122-45/+45
|\ \ \ \
| * | | | Enable ImportPath in scss-lintTakuya Noguchi2017-07-122-45/+45
| |/ / /
* | | | Merge branch 'enable-scss-lint-space-after-comma' into 'master'Clement Ho2017-07-125-17/+17
|\ \ \ \
| * | | | Enable SpaceAfterComma in scss-lintTakuya Noguchi2017-07-125-17/+17
| |/ / /
* | | | Merge branch 'breadcrumbs-limit-width' into 'master'Annabel Dunstone Gray2017-07-114-1/+4
|\ \ \ \
| * | | | Added limit-container-width to breadcrumbs containerbreadcrumbs-limit-widthPhil Hughes2017-07-114-1/+4
* | | | | Toggle import description with import_sources_enabledBrianna Kicia2017-07-111-2/+3
* | | | | Merge branch '34729-blob' into 'master'Douwe Maan2017-07-111-1/+1
|\ \ \ \ \
| * | | | | snippet has a blob, but isn't a blob34729-blobSimon Knox2017-07-121-1/+1
* | | | | | Merge branch '34907-dont-show-pipeline-schedule-button-for-non-member' into '...Kamil Trzciński2017-07-111-3/+4
|\ \ \ \ \ \
| * | | | | | Do not show pipeline schedule button for non-memberTakuya Noguchi2017-07-111-3/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'sidebar-badge-fix-firefox' into 'master'Filipa Lacerda2017-07-111-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fixed badge alignment in new project sidebar in FireFoxsidebar-badge-fix-firefoxPhil Hughes2017-07-111-2/+2
| | |/ / / | |/| | |
* | | | | Fix welcome page action items alignmentKushal Pandya2017-07-115-92/+40
* | | | | Merge branch '33949-remove-healthcheck-access-token' into 'master'Sean McGivern2017-07-115-29/+37
|\ \ \ \ \
| * | | | | Add tests for token auth.Pawel Chojnacki2017-07-061-4/+4
| * | | | | Finish refactring processed configuraiton, and add test validating ip range m...Pawel Chojnacki2017-07-051-3/+3
| * | | | | correctly handle transforming settings into useful datastructurePawel Chojnacki2017-07-051-1/+5
| * | | | | Bring back healthcheck token access to monitoring resources, but mark this as...Pawel Chojnacki2017-07-051-2/+11
| * | | | | Remove the need to use health check tokenPawel Chojnacki2017-07-055-29/+24
* | | | | | Merge branch '34909-pipeline-dropdown-z-index' into 'master'Filipa Lacerda2017-07-111-1/+1
|\ \ \ \ \ \
| * | | | | | Increase z index of mini pipeline dropdown34909-pipeline-dropdown-z-indexAnnabel Dunstone Gray2017-07-101-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Repair Regression caused by - !11573Paul Charlton2017-07-111-2/+4
| |_|/ / / |/| | | |
* | | | | Support multiple Redis instances based on queue typePaul Charlton2017-07-115-11/+15
|/ / / /
* | | | Fix milestones destroy servicefix_milestone_destroy_serviceFelipe Artur2017-07-101-2/+4
| |_|/ |/| |
* | | Merge branch 'sh-optimize-mr-api-emojis-and-labels' into 'master'Sean McGivern2017-07-101-33/+1
|\ \ \
| * | | Remove remaining N+1 queries in merge requests API with emojis and labelsStan Hu2017-07-081-33/+1
| | |/ | |/|
* | | Prevent bad data being added to application settings when Redis is unavailableNick Thomas2017-07-101-0/+3
* | | Merge branch 'backport-exceptions-argument' into 'master'Rémy Coutable2017-07-101-2/+4
|\ \ \
| * | | Allow passing exceptions when creating project servicesbackport-exceptions-argumentSean McGivern2017-07-101-2/+4
* | | | Merge branch 'fix/offline_runner_detection' into 'master'Rémy Coutable2017-07-101-3/+7
|\ \ \ \
| * | | | Fix offline runner detectionAlessio Caiazza2017-07-071-3/+7
* | | | | Merge branch '34810-vue-pagination' into 'master'Phil Hughes2017-07-101-5/+13
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update tests to test what the component renders and what the clicks calls34810-vue-paginationFilipa Lacerda2017-07-071-4/+10
| * | | | Use vue .prevent to prevent the clickFilipa Lacerda2017-07-071-3/+1
| * | | | Prevent default click since we change the url manuallyFilipa Lacerda2017-07-071-0/+4
* | | | | Merge branch 'dm-routing-helpers-fix' into 'master'31331-view-time-tracking-info-in-issue-board-contextual-sidebar29974-real-time-emoji-award-updatesMarin Jankovski2017-07-091-0/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |