summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix Ci::Runner#contacted_at is sometimes a string which breaks runner admin pagefix-broken-admin-runner-pageDylan Griffith2018-05-042-7/+61
* Merge branch 'pravi/gitlab-ce-update-grape-entity' into 'master'Stan Hu2018-05-043-6/+6
|\
| * Fix lambda arguments in Grape entitiesRémy Coutable2018-05-031-2/+2
| * Update grape-entity 0.6.0 -> 0.7.1Pirate Praveen2018-05-032-4/+4
* | Merge branch 'break-issue-title-for-board-card-title-and-issueable-header-tex...Clement Ho2018-05-032-0/+7
|\ \
| * | Break issue title for board card title and issuable header textGeorge Tsiolis2018-05-012-0/+7
* | | Merge branch 'add-loading-icon-padding-for-pipeline-environments' into 'master'Tim Zallmann2018-05-032-0/+6
|\ \ \
| * | | Add loading icon padding for pipeline environmentsGeorge Tsiolis2018-04-282-0/+6
* | | | Merge branch 'move-time-tracking-spent-only-pane-vue-component' into 'master'Phil Hughes2018-05-034-17/+25
|\ \ \ \
| * | | | Move TimeTrackingSpentOnlyPane vue componentGeorge Tsiolis2018-05-034-17/+25
* | | | | Merge branch 'add-padding-to-profile-description' into 'master'Phil Hughes2018-05-032-1/+6
|\ \ \ \ \
| * | | | | Add padding to profile descriptionGeorge Tsiolis2018-05-032-1/+6
* | | | | | Merge branch 'ide-tree-changes-count' into 'master'Filipa Lacerda2018-05-038-32/+203
|\ \ \ \ \ \
| * | | | | | 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 file specPhil Hughes2018-05-011-0/+5
| * | | | | | fixed eslintPhil Hughes2018-05-013-4/+0
| * | | | | | use getters to correctly get the counts for both unstaged & staged changesPhil Hughes2018-05-019-33/+128
| * | | | | | removed conflict markersPhil Hughes2018-04-301-3/+0
| * | | | | | Merge branch 'master' into ide-tree-changes-countPhil Hughes2018-04-30226-1556/+1867
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into ide-tree-changes-countPhil Hughes2018-04-25384-1834/+4394
| |\ \ \ \ \ \ \
| * | | | | | | | fixed specPhil Hughes2018-04-231-5/+1
| * | | | | | | | Merge branch 'master' into ide-tree-changes-countPhil Hughes2018-04-23292-1598/+1789
| |\ \ \ \ \ \ \ \
| * | | | | | | | | removed horrible getter & instead prefer the statePhil Hughes2018-04-209-82/+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
| * | | | | | | | | added component specPhil Hughes2018-04-201-2/+28
| * | | | | | | | | improve getters codePhil Hughes2018-04-201-5/+3
| * | | | | | | | | added support for staged filesPhil Hughes2018-04-195-13/+47
| * | | | | | | | | Merge branch 'master' into ide-tree-changes-countPhil Hughes2018-04-1962-521/+1907
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | updated stylingPhil Hughes2018-04-194-17/+60
| * | | | | | | | | | Added changes count to web IDE folderPhil Hughes2018-04-193-4/+16
* | | | | | | | | | | Merge branch 'change-docs-license' into 'master'Rémy Coutable2018-05-032-1/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Change the docs license to CC BY-SAAchilleas Pipinellis2018-05-032-1/+10
* | | | | | | | | | | | Merge branch 'update-omniauth-github' into 'master'Rémy Coutable2018-05-032-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | update omniauth-github ~> 1.1.1 to ~> 1.3Pirate Praveen2018-05-032-5/+5
* | | | | | | | | | | | Merge branch 'bw-add-console-message' into 'master'Robert Speicher2018-05-032-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Output some useful information when running the rails consoleBrett Walker2018-05-032-0/+15
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '45970-additional-signout-needed' into 'master'Douwe Maan2018-05-031-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | ensure users are signed out properly in user_uses_slash_commands_spec.rbLukas Eipert2018-05-031-0/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '5480-sidebar-subscription-event-handling' into 'master'Phil Hughes2018-05-036-10/+60
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Emit `toggleSidebar` event on component when icon is clickedKushal Pandya2018-05-032-0/+18
| * | | | | | | | | | Consume `toggleSubscription` event directly from Subscriptions componentKushal Pandya2018-05-032-9/+2
| * | | | | | | | | | Emit `toggleSubscription`, `toggleSidebar` events on componentKushal Pandya2018-05-032-1/+40
* | | | | | | | | | | Merge branch 'update-devise' into 'master'Douwe Maan2018-05-032-10/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | update devise 4.2 -> 4.4Pirate Praveen2018-05-032-10/+11
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'blackst0ne-rails5-fix-trusted-proxies' into 'master'Rémy Coutable2018-05-031-0/+13
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | [Rails5] Fix trusted proxiesblackst0ne2018-05-031-0/+13