Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Backport MR from EE | Clement Ho | 2017-05-26 | 3 | -3/+6 |
| | |||||
* | Merge branch 'dm-consistent-last-push-event' into 'master' | Robert Speicher | 2017-05-26 | 15 | -65/+61 |
|\ | | | | | | | | | Consistently display last push event widget See merge request !11585 | ||||
| * | Make section connect with window border without extra padding | Douwe Maan | 2017-05-25 | 9 | -29/+35 |
| | | |||||
| * | Kill copy button with 🔥 | Douwe Maan | 2017-05-25 | 1 | -4/+2 |
| | | |||||
| * | Consistently display last push event widget | Douwe Maan | 2017-05-25 | 13 | -47/+39 |
| | | |||||
* | | Merge branch 'issuable-form-create-label-sub-groups' into 'master' | Filipa Lacerda | 2017-05-26 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Fixed create new label form in issue form not working for sub-group projects Closes #32906 See merge request !11703 | ||||
| * | | Fixed create new label form in issue form not working for sub-group projectsissuable-form-create-label-sub-groups | Phil Hughes | 2017-05-25 | 1 | -1/+1 |
| | | | | | | | | | | | | Closes #32906 | ||||
* | | | Merge branch 'dm-diff-cleanup' into 'master' | Robert Speicher | 2017-05-25 | 13 | -136/+130 |
|\ \ \ | |_|/ |/| | | | | | | | | Clean up diff rendering See merge request !11390 | ||||
| * | | Address feedback | Douwe Maan | 2017-05-25 | 1 | -4/+2 |
| | | | |||||
| * | | Pass fallback_diff_refs to Diff::File instead of using view helpers | Douwe Maan | 2017-05-23 | 6 | -17/+17 |
| | | | |||||
| * | | Clean up diff rendering | Douwe Maan | 2017-05-23 | 8 | -103/+99 |
| | | | |||||
| * | | Add question mark to Gitlab::Diff::File predicate methods | Douwe Maan | 2017-05-23 | 6 | -30/+30 |
| | | | |||||
* | | | Merge branch '32801-fix-discussion-header-wrapping-in-parallel-diff' into ↵ | Annabel Dunstone Gray | 2017-05-25 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix note header author and time ago wrapping in parallel diff Closes #32801 See merge request !11702 | ||||
| * | | | Fix note header author and time ago wrapping in parallel diff32801-fix-discussion-header-wrapping-in-parallel-diff | Eric Eastwood | 2017-05-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32801 | ||||
* | | | | Merge branch 'revert-b0498c17' into 'master' | Robert Speicher | 2017-05-25 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Refactor `DynamicPathValidator` and `GitLab::Regex` some more See merge request !11693 | ||||
| * | | | | Revert "Remove changes that are not absolutely necessary" | Douwe Maan | 2017-05-24 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | This reverts commit b0498c176fa134761d899c9b369be12f1ca789c5 | ||||
* | | | | | Merge branch '17848-web-hook-logging' into 'master' | Dmitriy Zaporozhets | 2017-05-25 | 10 | -2/+158 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Implement Web Hooks calls logging Closes #17848 See merge request !11027 | ||||
| * | | | | Implement web hooks logging | Alexander Randa | 2017-05-25 | 10 | -2/+158 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * implemented logging of project and system web hooks * implemented UI for user area (project hooks) * implemented UI for admin area (system hooks) * implemented retry of logged webhook * NOT imeplemented log remover | ||||
* | | | | | Merge branch '32807-company-icon' into 'master' | Phil Hughes | 2017-05-25 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use briefcase icon for company Closes #32807 See merge request !11692 | ||||
| * | | | | | Use briefcase icon for company32807-company-icon | Annabel Dunstone Gray | 2017-05-24 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'feature/rss-scoped-token' into 'master' | Douwe Maan | 2017-05-24 | 2 | -26/+19 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use rss token for atom access See merge request !11647 | ||||
| * | | | | | extract partial | Alexis Reigel | 2017-05-24 | 2 | -24/+14 |
| | | | | | | |||||
| * | | | | | user can reset his rss token on the account page | Alexis Reigel | 2017-05-24 | 1 | -4/+12 |
| | | | | | | |||||
| * | | | | | remove dead code | Alexis Reigel | 2017-05-24 | 1 | -9/+4 |
| |/ / / / | |||||
* | | | | | Remove redundant data-turbolink attributes from links | blackst0ne | 2017-05-25 | 3 | -7/+7 |
|/ / / / | |||||
* | | | | Merge branch 'dm-outdated-system-note' into 'master' | Grzegorz Bizon | 2017-05-24 | 2 | -5/+4 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add system note with link to diff comparison when MR discussion becomes outdated Closes #30058 See merge request !11584 | ||||
| * | | | | Add system note with link to diff comparison when MR discussion becomes outdated | Douwe Maan | 2017-05-23 | 2 | -5/+4 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch '32170-assignees-spinner' into 'master' | Phil Hughes | 2017-05-24 | 1 | -0/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show loading indicator while waiting for assignees first fetch Closes #32170 See merge request !11434 | ||||
| * | | | | add loading spinner to sidebar assignees32170-assignees-spinner | Simon Knox | 2017-05-24 | 1 | -0/+3 |
| | |_|/ | |/| | | | | | | | | | | store isFetching state to indicate if assignees has initial data | ||||
* | | | | Merge branch '32828-refresh-build' into 'master' | Phil Hughes | 2017-05-24 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use refresh icon for retried jobs Closes #32828 See merge request !11667 | ||||
| * | | | | Use refresh icon for retried jobs32828-refresh-build | Annabel Dunstone Gray | 2017-05-23 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Fix user and issues autocomplete in diff notes | Kushal Pandya | 2017-05-24 | 6 | -6/+6 |
| | | | | |||||
* | | | | Reorder Issue action buttons as per UX recommendation | Kushal Pandya | 2017-05-24 | 1 | -12/+16 |
| | | | | |||||
* | | | | Merge branch ↵ | Phil Hughes | 2017-05-24 | 1 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32563-remove-duplicated-config-code-for-filtered-search-dropdowns' into 'master' Resolve "Remove duplicated config code for filtered search dropdowns" Closes #32563 See merge request !11512 | ||||
| * | | | | Remove duplicated code | Clement Ho | 2017-05-18 | 1 | -4/+4 |
| | | | | | |||||
* | | | | | Merge branch '32682-skipped-ci-icon' into 'master' | Phil Hughes | 2017-05-24 | 2 | -2/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | Adds new icon for CI skipped status Closes #32682 See merge request !11606 | ||||
| * | | | | Adds new icon for CI skipped status32682-skipped-ci-icon | Filipa Lacerda | 2017-05-22 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch '32509-next-run-in-pipeline-schedules-shows-past-time' into ↵ | Kamil Trzciński | 2017-05-23 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Use #real_next_run in pipelines table Closes #32509 See merge request !11660 | ||||
| * | | | | Use real_next_run in pipeline schedule table. | Bryce Johnson | 2017-05-23 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Change ‘Project view’ label to ‘Project home page content’29881-default-project-view-highlighted-tab-when-changing-settings | Pedro Moreira da Silva | 2017-05-23 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Valery Sizov | 2017-05-23 | 190 | -1164/+855 |
|\ \ \ \ | | | | | | | | | | | | | | | | 17489-hide-code-from-guests | ||||
| * \ \ \ | Merge branch 'prevent-project-transfer' into 'master' | Douwe Maan | 2017-05-23 | 1 | -4/+6 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent project transfer if a new group is not selected Closes #25455 See merge request !11214 | ||||
| | * | | | | Renamed some messages and refactored the project_edit class to a function | Jose Ivan Vargas | 2017-05-22 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Prevent project transfer if a new group is not selected | Jose Ivan Vargas | 2017-05-22 | 1 | -4/+6 |
| | | | | | | |||||
| * | | | | | Merge branch '32418-make-link-to-self-less-obvious' into 'master' | Fatih Acet | 2017-05-22 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change links to issuable meta to black Closes #32418 See merge request !11505 | ||||
| | * | | | | | Change links to issuable meta to black | Annabel Dunstone Gray | 2017-05-19 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch '32631-issue-emoji-wrap' into 'master' | Clement Ho | 2017-05-22 | 1 | -3/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spacing of issue emojis Closes #32631 See merge request !11567 | ||||
| | * | | | | | | Fix spacing of issue emojis32631-issue-emoji-wrap | Annabel Dunstone Gray | 2017-05-19 | 1 | -3/+3 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'ce#32623-browser-tooltip-commits-branch-list' into 'master' | Annabel Dunstone Gray | 2017-05-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32623 Change order of commits ahead and behind on divergence graph for branch list Closes #32623 See merge request !11559 | ||||
| | * | | | | | | 32623 Change order of commits ahead and behind on divergence graph for ↵ce#32623-browser-tooltip-commits-branch-list | tauriedavis | 2017-05-19 | 1 | -1/+1 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | branch list |