summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'add-view-replaced-file-link' into 'master'Rémy Coutable2017-09-222-4/+8
|\ | | | | | | | | Add view replaced file link for image diffs See merge request gitlab-org/gitlab-ce!14394
| * Add view replaced file link for image diffsadd-view-replaced-file-linkClement Ho2017-09-202-4/+8
| |
* | Merge branch '38088-remove-banner-to-customize-experience' into 'master'Douwe Maan2017-09-213-18/+0
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Remove banner to customize experience" Closes #38088 See merge request gitlab-org/gitlab-ce!14384
| * | Removed User Callout for Customer ExperienceTim Zallmann2017-09-203-18/+0
| | |
* | | Merge branch '38049-fix-resolve-in-new-issue-btn' into 'master'Annabel Dunstone Gray2017-09-202-8/+12
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix the "resolve discussion in a new issue" button Closes #38049 See merge request gitlab-org/gitlab-ce!14357
| * | Fix the "resolve discussion in a new issue" buttonNick Thomas2017-09-202-8/+12
| | |
* | | Merge branch '36884-gitaly-admin-version' into 'master'Tim Zallmann2017-09-201-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add Gitaly version to Admin Dashboard Closes #36884 See merge request gitlab-org/gitlab-ce!14313
| * | | Add Gitaly version to Admin DashboardJacopo2017-09-191-2/+6
| | | | | | | | | | | | | | | | Displays the Gitaly version in the admin dashboard.
* | | | Merge branch 'add_tooltip_for_milestone_in_issues_list' into 'master'Douwe Maan2017-09-203-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tooltip for milestone due date to issue and merge request lists Closes #18864 See merge request gitlab-org/gitlab-ce!14318
| * | | | Add tooltip for milestone due date to issue and merge request listsVitaliy @blackst0ne Klachkov2017-09-203-4/+4
| | | | |
* | | | | Merge branch 'mk-clarify-moving-namespaces' into 'master'Douwe Maan2017-09-202-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clarify how to rename username or group path See merge request gitlab-org/gitlab-ce!13914
| * | | | | Add "Changing your username" section to docsMichael Kozono2017-09-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | And link to it from where you change your username.
| * | | | | Move help for renaming group path to docsMichael Kozono2017-09-191-5/+3
| | |_|_|/ | |/| | | | | | | | | | | | | And expand on the help text.
* | | | | Merge branch '37894-handle-if-auto-devops-domain-is-not-set' into 'master'Stan Hu2017-09-192-10/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Handle if Auto DevOps domain is not set" Closes #37894 See merge request gitlab-org/gitlab-ce!14319
| * | | | | Update _show.html.hamlFabio Busatto2017-09-191-0/+1
| | | | | |
| * | | | | Improve after code-reviewKamil Trzcinski2017-09-191-1/+1
| | | | | |
| * | | | | Add warning message if domain or cluster are not configuredbokebilly2017-09-192-10/+11
| | |_|_|/ | |/| | |
* | | | | Merge branch 'revert-feature-highlight' into 'master'Jacob Schatz2017-09-193-113/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert feature highlight Closes #38087 See merge request gitlab-org/gitlab-ce!14373
| * | | | | Revert feature highlightClement Ho2017-09-193-113/+0
| | |/ / / | |/| | |
* | | | | Revert changes made to merge requests blank slateKamil Trzcinski2017-09-191-7/+6
| | | | |
* | | | | Enhance reuse in MRbikebilly2017-09-191-0/+1
| | | | |
* | | | | Enhance reuse in MRbikebilly2017-09-191-7/+6
| | | | |
* | | | | Remove double div in MRbikebilly2017-09-191-4/+3
| | | | |
* | | | | Remove double divbikebilly2017-09-191-4/+2
| | | | |
* | | | | Add banner in missing pagesbokebilly2017-09-192-2/+8
| |/ / / |/| | |
* | | | Change all instances of btn-sm to btn-small to keep things consistentJedidiah2017-09-194-5/+5
| | | |
* | | | Merge branch 'zj-update-project-settings' into 'master'Grzegorz Bizon2017-09-191-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow updating of project auto devops settings Closes #37893 See merge request gitlab-org/gitlab-ce!14291
| * | | | Fix instance default option being true as valueZeger-Jan van de Weg2017-09-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user selected 'Instance default' as value for the auto devops settings, this was interpreted as a true value. Now we post an empty string in this case, meaning we want to set `NULL` in the database. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37893#note_40541294
* | | | | Merge branch 'repo-editor-ui-fix' into 'master'Jacob Schatz2017-09-191-12/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repo editor UI fixes part 2 Closes #37830, #36247, #37829, and #36244 See merge request gitlab-org/gitlab-ce!14261
| * | | | | RepoEditor: Fix target branch dropdown styling.Fatih Acet2017-09-141-12/+8
| | | | | |
* | | | | | Merge branch '37465-fix-line-resolve-all-green-checkmark-icon' into 'master'Annabel Dunstone Gray2017-09-181-1/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update "x/x discussions resolved" checkmark icon to be green when all discussions resolved Closes #37465 See merge request gitlab-org/gitlab-ce!14255
| * | | | | Update line-resolve-all checkmark to be green when all discussions resolved37465-fix-line-resolve-all-green-checkmark-iconEric Eastwood2017-09-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37465 Related MRs - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13821 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14042
* | | | | | Merge branch 'milestone-avatar-issuable-link' into 'master'Tim Zallmann2017-09-181-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes milestone issuable assignee URL Closes #33124 See merge request gitlab-org/gitlab-ce!14292
| * | | | | | Fixes milestone issuable assignee URLmilestone-avatar-issuable-linkPhil Hughes2017-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #33124
* | | | | | | Improve “New project“ page description37933-improve-new-project-page-description-explaining-what-a-project-isPedro Moreira da Silva2017-09-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain what a project is instead of what a user can do
* | | | | | | Use correct group members path for members flyout link37957-fix-groups-members-flyout-linkkushalpandya2017-09-181-1/+1
| | | | | | |
* | | | | | | Merge branch '21331-improve-confusing-compare-page' into 'master'Phil Hughes2017-09-152-16/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the labels in the Compare form less confusing Closes #21331 See merge request gitlab-org/gitlab-ce!14225
| * | | | | | | Make the labels in the Compare form less confusing21331-improve-confusing-compare-pageRémy Coutable2017-09-152-16/+22
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Improve the descriptive text * Rename "from" to "Target" and "to" to "Source" * Swap "Target" and "Source" to have the same order as in MRs * Reworded "Switch base of comparison" to "Swap versions" Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'projects-controller-show' into 'master'Rémy Coutable2017-09-151-16/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SQL performance improvements for ProjectsController#show See merge request gitlab-org/gitlab-ce!14226
| * | | | | | | Memoize the latest builds of a pipelineprojects-controller-showYorick Peterse2017-09-141-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that if a pipeline is present for the last commit on a project's homepage we only run 1 query to get the builds, instead of running 2 queries. See https://gitlab.com/gitlab-org/gitlab-ce/issues/36878#note_40073339 for more information.
| * | | | | | | Memoize pipelines for project download buttonsYorick Peterse2017-09-141-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds Project#latest_successful_pipeline_for and Project#latest_successful_pipeline_for_default_branch. The 2nd method memoizes the result (taking nil values into account) to ensure the underlying query isn't executed multiple times when viewing a project's homepage. See https://gitlab.com/gitlab-org/gitlab-ce/issues/36878#note_40073607 for more information.
* | | | | | | Display whether branch has been merged when deleting protected branchWinnie Hellmann2017-09-152-3/+9
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'revert-sidebar-title-attribute' into 'master'Filipa Lacerda2017-09-154-38/+38
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Remove title attribute from sidebar elements See merge request gitlab-org/gitlab-ce!14140
| * | | | | Remove title attribute from sidebar elementsPhil Hughes2017-09-134-38/+38
| | | | | |
* | | | | | Merge branch '20824-scope-users-to-members-in-group-issuable-list' into 'master'Phil Hughes2017-09-151-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Scope users by group inside dropdowns if I'm on group page (Issue, MRs)" Closes #20824 See merge request gitlab-org/gitlab-ce!14249
| * | | | | | Scope users by group in issuable search barbarthc2017-09-131-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Fix typo37886-typo-in-protected-runners-setting-checkboxFabio Busatto2017-09-141-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'changes-overflow-fix' into 'master'Annabel Dunstone Gray2017-09-141-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed overflow issue in changes dropdown See merge request gitlab-org/gitlab-ce!14181
| * | | | | Fixed overflow issue in changes dropdownchanges-overflow-fixPhil Hughes2017-09-131-2/+2
| |/ / / /
* | | | | Add missing classes to omniauth remember-me checkbox and add correct font-sizeJedidiah2017-09-141-3/+5
| |/ / / |/| | |