summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Backport MR from EEClement Ho2017-05-263-3/+6
|
* Merge branch 'dm-consistent-last-push-event' into 'master'Robert Speicher2017-05-2615-65/+61
|\ | | | | | | | | Consistently display last push event widget See merge request !11585
| * Make section connect with window border without extra paddingDouwe Maan2017-05-259-29/+35
| |
| * Kill copy button with 🔥Douwe Maan2017-05-251-4/+2
| |
| * Consistently display last push event widgetDouwe Maan2017-05-2513-47/+39
| |
* | Merge branch 'issuable-form-create-label-sub-groups' into 'master'Filipa Lacerda2017-05-261-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-groupsPhil Hughes2017-05-251-1/+1
| | | | | | | | | | | | Closes #32906
* | | Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher2017-05-2513-136/+130
|\ \ \ | |_|/ |/| | | | | | | | Clean up diff rendering See merge request !11390
| * | Address feedbackDouwe Maan2017-05-251-4/+2
| | |
| * | Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-236-17/+17
| | |
| * | Clean up diff renderingDouwe Maan2017-05-238-103/+99
| | |
| * | Add question mark to Gitlab::Diff::File predicate methodsDouwe Maan2017-05-236-30/+30
| | |
* | | Merge branch '32801-fix-discussion-header-wrapping-in-parallel-diff' into ↵Annabel Dunstone Gray2017-05-251-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-diffEric Eastwood2017-05-251-1/+1
| | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32801
* | | | Merge branch 'revert-b0498c17' into 'master'Robert Speicher2017-05-252-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor `DynamicPathValidator` and `GitLab::Regex` some more See merge request !11693
| * | | | Revert "Remove changes that are not absolutely necessary"Douwe Maan2017-05-242-2/+2
| | | | | | | | | | | | | | | This reverts commit b0498c176fa134761d899c9b369be12f1ca789c5
* | | | | Merge branch '17848-web-hook-logging' into 'master'Dmitriy Zaporozhets2017-05-2510-2/+158
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Implement Web Hooks calls logging Closes #17848 See merge request !11027
| * | | | Implement web hooks loggingAlexander Randa2017-05-2510-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 Hughes2017-05-251-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use briefcase icon for company Closes #32807 See merge request !11692
| * | | | | Use briefcase icon for company32807-company-iconAnnabel Dunstone Gray2017-05-241-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'feature/rss-scoped-token' into 'master'Douwe Maan2017-05-242-26/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use rss token for atom access See merge request !11647
| * | | | | extract partialAlexis Reigel2017-05-242-24/+14
| | | | | |
| * | | | | user can reset his rss token on the account pageAlexis Reigel2017-05-241-4/+12
| | | | | |
| * | | | | remove dead codeAlexis Reigel2017-05-241-9/+4
| |/ / / /
* | | | | Remove redundant data-turbolink attributes from linksblackst0ne2017-05-253-7/+7
|/ / / /
* | | | Merge branch 'dm-outdated-system-note' into 'master'Grzegorz Bizon2017-05-242-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 outdatedDouwe Maan2017-05-232-5/+4
| | |_|/ | |/| |
* | | | Merge branch '32170-assignees-spinner' into 'master'Phil Hughes2017-05-241-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show loading indicator while waiting for assignees first fetch Closes #32170 See merge request !11434
| * | | | add loading spinner to sidebar assignees32170-assignees-spinnerSimon Knox2017-05-241-0/+3
| | |_|/ | |/| | | | | | | | | | store isFetching state to indicate if assignees has initial data
* | | | Merge branch '32828-refresh-build' into 'master'Phil Hughes2017-05-241-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use refresh icon for retried jobs Closes #32828 See merge request !11667
| * | | | Use refresh icon for retried jobs32828-refresh-buildAnnabel Dunstone Gray2017-05-231-1/+1
| | |/ / | |/| |
* | | | Fix user and issues autocomplete in diff notesKushal Pandya2017-05-246-6/+6
| | | |
* | | | Reorder Issue action buttons as per UX recommendationKushal Pandya2017-05-241-12/+16
| | | |
* | | | Merge branch ↵Phil Hughes2017-05-241-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 codeClement Ho2017-05-181-4/+4
| | | | |
* | | | | Merge branch '32682-skipped-ci-icon' into 'master'Phil Hughes2017-05-242-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Adds new icon for CI skipped status Closes #32682 See merge request !11606
| * | | | Adds new icon for CI skipped status32682-skipped-ci-iconFilipa Lacerda2017-05-222-2/+2
| | | | |
* | | | | Merge branch '32509-next-run-in-pipeline-schedules-shows-past-time' into ↵Kamil Trzciński2017-05-231-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 Johnson2017-05-231-1/+1
| | | | |
* | | | | Change ‘Project view’ label to ‘Project home page content’29881-default-project-view-highlighted-tab-when-changing-settingsPedro Moreira da Silva2017-05-231-2/+2
|/ / / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Valery Sizov2017-05-23190-1164/+855
|\ \ \ \ | | | | | | | | | | | | | | | 17489-hide-code-from-guests
| * \ \ \ Merge branch 'prevent-project-transfer' into 'master'Douwe Maan2017-05-231-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 functionJose Ivan Vargas2017-05-221-1/+1
| | | | | |
| | * | | | Prevent project transfer if a new group is not selectedJose Ivan Vargas2017-05-221-4/+6
| | | | | |
| * | | | | Merge branch '32418-make-link-to-self-less-obvious' into 'master'Fatih Acet2017-05-221-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change links to issuable meta to black Closes #32418 See merge request !11505
| | * | | | | Change links to issuable meta to blackAnnabel Dunstone Gray2017-05-191-1/+1
| | | | | | |
| * | | | | | Merge branch '32631-issue-emoji-wrap' into 'master'Clement Ho2017-05-221-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spacing of issue emojis Closes #32631 See merge request !11567
| | * | | | | | Fix spacing of issue emojis32631-issue-emoji-wrapAnnabel Dunstone Gray2017-05-191-3/+3
| | | | | | | |
| * | | | | | | Merge branch 'ce#32623-browser-tooltip-commits-branch-list' into 'master'Annabel Dunstone Gray2017-05-221-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-listtauriedavis2017-05-191-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | branch list