summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Add validation and skip logic at #truncateShinya Maeda2018-05-041-2/+5
* Introduce Redis helpers. Rename BuildTraceChunkFlushToDbWorker to Ci::BuildTr...Shinya Maeda2018-05-044-14/+15
* Merge branch 'master' into live-trace-v2Shinya Maeda2018-05-0433-123/+319
|\
| * Merge branch 'break-issue-title-for-board-card-title-and-issueable-header-tex...Clement Ho2018-05-031-0/+2
| |\
| | * Break issue title for board card title and issuable header textGeorge Tsiolis2018-05-011-0/+2
| * | Merge branch 'add-loading-icon-padding-for-pipeline-environments' into 'master'Tim Zallmann2018-05-031-0/+1
| |\ \
| | * | Add loading icon padding for pipeline environmentsGeorge Tsiolis2018-04-281-0/+1
| * | | Merge branch 'move-time-tracking-spent-only-pane-vue-component' into 'master'Phil Hughes2018-05-033-17/+20
| |\ \ \
| | * | | Move TimeTrackingSpentOnlyPane vue componentGeorge Tsiolis2018-05-033-17/+20
| * | | | Merge branch 'add-padding-to-profile-description' into 'master'Phil Hughes2018-05-031-1/+1
| |\ \ \ \
| | * | | | Add padding to profile descriptionGeorge Tsiolis2018-05-031-1/+1
| * | | | | Merge branch 'ide-tree-changes-count' into 'master'Filipa Lacerda2018-05-036-30/+112
| |\ \ \ \ \
| | * | | | | created computed propsPhil Hughes2018-05-022-3/+9
| | * | | | | scroll active item into view with animationPhil Hughes2018-05-021-1/+4
| | * | | | | fixed gettersPhil Hughes2018-05-012-5/+5
| | * | | | | fixed staged files not being recognisedPhil Hughes2018-05-012-15/+13
| | * | | | | fixed eslintPhil Hughes2018-05-013-4/+0
| | * | | | | use getters to correctly get the counts for both unstaged & staged changesPhil Hughes2018-05-017-32/+65
| | * | | | | removed conflict markersPhil Hughes2018-04-301-3/+0
| | * | | | | Merge branch 'master' into ide-tree-changes-countPhil Hughes2018-04-3053-303/+374
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into ide-tree-changes-countPhil Hughes2018-04-2571-758/+1430
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into ide-tree-changes-countPhil Hughes2018-04-2348-257/+625
| | |\ \ \ \ \ \ \
| | * | | | | | | | removed horrible getter & instead prefer the statePhil Hughes2018-04-208-19/+38
| | * | | | | | | | updated code to use getter to get changedFilePhil Hughes2018-04-201-5/+5
| | * | | | | | | | fixed icon not showing for parentsPhil Hughes2018-04-201-1/+1
| | * | | | | | | | improve getters codePhil Hughes2018-04-201-5/+3
| | * | | | | | | | added support for staged filesPhil Hughes2018-04-194-13/+17
| | * | | | | | | | Merge branch 'master' into ide-tree-changes-countPhil Hughes2018-04-1932-314/+910
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | updated stylingPhil Hughes2018-04-193-17/+27
| | * | | | | | | | | Added changes count to web IDE folderPhil Hughes2018-04-193-4/+16
| * | | | | | | | | | Merge branch '5480-sidebar-subscription-event-handling' into 'master'Phil Hughes2018-05-033-8/+26
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| | * | | | | | | | | Emit `toggleSidebar` event on component when icon is clickedKushal Pandya2018-05-031-0/+4
| | * | | | | | | | | Consume `toggleSubscription` event directly from Subscriptions componentKushal Pandya2018-05-031-7/+1
| | * | | | | | | | | Emit `toggleSubscription`, `toggleSidebar` events on componentKushal Pandya2018-05-031-1/+21
| * | | | | | | | | | Merge branch 'update-environment-item-action-buttons-icons' into 'master'Filipa Lacerda2018-05-035-34/+34
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Update environment item action buttons iconsGeorge Tsiolis2018-05-035-34/+34
| * | | | | | | | | | | [Rails5] Fix params passed to MergeWorkerblackst0ne2018-05-031-1/+1
| * | | | | | | | | | | Improve Web IDE Commit PanelAndré Luís2018-05-0310-29/+105
| * | | | | | | | | | | Add pass through to stripHtml for undefined and null inputsOlivier Gonzalez2018-05-031-1/+5
| * | | | | | | | | | | Merge branch 'ce-jej/identity-relates-to-saml' into 'master'Douwe Maan2018-05-031-2/+6
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Backport Identity.uniqueness_scope from EEJames Edwards-Jones2018-05-021-2/+6
| * | | | | | | | | | | | Merge branch 'change-font-for-tables-inside-diff-discussions' into 'master'Filipa Lacerda2018-05-031-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Change font for tables inside diff discussionsGeorge Tsiolis2018-05-011-0/+6
| | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into live-trace-v2Shinya Maeda2018-05-0366-3001/+6052
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Load branches on new merge request page asynchronouslyWinnie Hellmann2018-05-029-135/+138
| * | | | | | | | | | | Optimize Emoji Sprite HandlingTim Zallmann2018-05-027-2697/+5499
| * | | | | | | | | | | Merge branch 'revert-75f6e91f' into 'master'Phil Hughes2018-05-022-2/+9
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Revert "Merge branch '5480-sidebar-subscription-event-handling' into 'master'"Rémy Coutable2018-05-022-2/+9
| * | | | | | | | | | | | Merge branch '45761-replace-actionview-time_ago_in_words' into 'master'Rémy Coutable2018-05-0213-17/+13
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Replace time_ago_in_words with JS-based oneTakuya Noguchi2018-04-2713-17/+13
View Lorry Controller Status