Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Wrap async call in run_after_commit_or_nowash.mckenzie/close-service-async-notifications-fix | Ash McKenzie | 2018-05-04 | 1 | -1/+7 |
* | Merge branch 'pravi/gitlab-ce-update-grape-entity' into 'master' | Stan Hu | 2018-05-04 | 3 | -6/+6 |
|\ | |||||
| * | Fix lambda arguments in Grape entities | Rémy Coutable | 2018-05-03 | 1 | -2/+2 |
| * | Update grape-entity 0.6.0 -> 0.7.1 | Pirate Praveen | 2018-05-03 | 2 | -4/+4 |
* | | Merge branch 'break-issue-title-for-board-card-title-and-issueable-header-tex... | Clement Ho | 2018-05-03 | 2 | -0/+7 |
|\ \ | |||||
| * | | Break issue title for board card title and issuable header text | George Tsiolis | 2018-05-01 | 2 | -0/+7 |
* | | | Merge branch 'add-loading-icon-padding-for-pipeline-environments' into 'master' | Tim Zallmann | 2018-05-03 | 2 | -0/+6 |
|\ \ \ | |||||
| * | | | Add loading icon padding for pipeline environments | George Tsiolis | 2018-04-28 | 2 | -0/+6 |
* | | | | Merge branch 'move-time-tracking-spent-only-pane-vue-component' into 'master' | Phil Hughes | 2018-05-03 | 4 | -17/+25 |
|\ \ \ \ | |||||
| * | | | | Move TimeTrackingSpentOnlyPane vue component | George Tsiolis | 2018-05-03 | 4 | -17/+25 |
* | | | | | Merge branch 'add-padding-to-profile-description' into 'master' | Phil Hughes | 2018-05-03 | 2 | -1/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Add padding to profile description | George Tsiolis | 2018-05-03 | 2 | -1/+6 |
* | | | | | | Merge branch 'ide-tree-changes-count' into 'master' | Filipa Lacerda | 2018-05-03 | 8 | -32/+203 |
|\ \ \ \ \ \ | |||||
| * | | | | | | created computed props | Phil Hughes | 2018-05-02 | 2 | -3/+9 |
| * | | | | | | scroll active item into view with animation | Phil Hughes | 2018-05-02 | 1 | -1/+4 |
| * | | | | | | fixed getters | Phil Hughes | 2018-05-01 | 2 | -5/+5 |
| * | | | | | | fixed staged files not being recognised | Phil Hughes | 2018-05-01 | 2 | -15/+13 |
| * | | | | | | fixed file spec | Phil Hughes | 2018-05-01 | 1 | -0/+5 |
| * | | | | | | fixed eslint | Phil Hughes | 2018-05-01 | 3 | -4/+0 |
| * | | | | | | use getters to correctly get the counts for both unstaged & staged changes | Phil Hughes | 2018-05-01 | 9 | -33/+128 |
| * | | | | | | removed conflict markers | Phil Hughes | 2018-04-30 | 1 | -3/+0 |
| * | | | | | | Merge branch 'master' into ide-tree-changes-count | Phil Hughes | 2018-04-30 | 226 | -1556/+1867 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into ide-tree-changes-count | Phil Hughes | 2018-04-25 | 384 | -1834/+4394 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | fixed spec | Phil Hughes | 2018-04-23 | 1 | -5/+1 |
| * | | | | | | | | Merge branch 'master' into ide-tree-changes-count | Phil Hughes | 2018-04-23 | 292 | -1598/+1789 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | removed horrible getter & instead prefer the state | Phil Hughes | 2018-04-20 | 9 | -82/+38 |
| * | | | | | | | | | updated code to use getter to get changedFile | Phil Hughes | 2018-04-20 | 1 | -5/+5 |
| * | | | | | | | | | fixed icon not showing for parents | Phil Hughes | 2018-04-20 | 1 | -1/+1 |
| * | | | | | | | | | added component spec | Phil Hughes | 2018-04-20 | 1 | -2/+28 |
| * | | | | | | | | | improve getters code | Phil Hughes | 2018-04-20 | 1 | -5/+3 |
| * | | | | | | | | | added support for staged files | Phil Hughes | 2018-04-19 | 5 | -13/+47 |
| * | | | | | | | | | Merge branch 'master' into ide-tree-changes-count | Phil Hughes | 2018-04-19 | 62 | -521/+1907 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | updated styling | Phil Hughes | 2018-04-19 | 4 | -17/+60 |
| * | | | | | | | | | | Added changes count to web IDE folder | Phil Hughes | 2018-04-19 | 3 | -4/+16 |
* | | | | | | | | | | | Merge branch 'change-docs-license' into 'master' | Rémy Coutable | 2018-05-03 | 2 | -1/+10 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Change the docs license to CC BY-SA | Achilleas Pipinellis | 2018-05-03 | 2 | -1/+10 |
* | | | | | | | | | | | | Merge branch 'update-omniauth-github' into 'master' | Rémy Coutable | 2018-05-03 | 2 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | update omniauth-github ~> 1.1.1 to ~> 1.3 | Pirate Praveen | 2018-05-03 | 2 | -5/+5 |
* | | | | | | | | | | | | Merge branch 'bw-add-console-message' into 'master' | Robert Speicher | 2018-05-03 | 2 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Output some useful information when running the rails console | Brett Walker | 2018-05-03 | 2 | -0/+15 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch '45970-additional-signout-needed' into 'master' | Douwe Maan | 2018-05-03 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | ensure users are signed out properly in user_uses_slash_commands_spec.rb | Lukas Eipert | 2018-05-03 | 1 | -0/+2 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch '5480-sidebar-subscription-event-handling' into 'master' | Phil Hughes | 2018-05-03 | 6 | -10/+60 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Emit `toggleSidebar` event on component when icon is clicked | Kushal Pandya | 2018-05-03 | 2 | -0/+18 |
| * | | | | | | | | | | Consume `toggleSubscription` event directly from Subscriptions component | Kushal Pandya | 2018-05-03 | 2 | -9/+2 |
| * | | | | | | | | | | Emit `toggleSubscription`, `toggleSidebar` events on component | Kushal Pandya | 2018-05-03 | 2 | -1/+40 |
* | | | | | | | | | | | Merge branch 'update-devise' into 'master' | Douwe Maan | 2018-05-03 | 2 | -10/+11 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | update devise 4.2 -> 4.4 | Pirate Praveen | 2018-05-03 | 2 | -10/+11 |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'blackst0ne-rails5-fix-trusted-proxies' into 'master' | Rémy Coutable | 2018-05-03 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | [Rails5] Fix trusted proxies | blackst0ne | 2018-05-03 | 1 | -0/+13 |