summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/_merge_request.html.haml
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into bootstrap4Clement Ho2018-04-191-1/+1
|\
| * Resolve "Improve tooltips of collapsed sidebars"Dennis Tang2018-04-191-1/+1
| |
* | Set html:true for tooltipsClement Ho2018-04-191-1/+1
| |
* | Convert tooltip html: 1 to html: trueClement Ho2018-04-171-1/+1
| |
* | [skip ci] Fix bad migrations of -block to -inline-blockClement Ho2018-04-101-8/+8
| |
* | [skip ci] Replace hidden-xsClement Ho2018-04-091-8/+8
| |
* | [skip ci] Replace .pull-right with .float-rightClement Ho2018-04-091-1/+1
|/
* Issuable list: add tooltips to iconsLukas Eipert2018-03-211-4/+4
|
* Replaced the remaining code-fork iconsjivl-general-icons-2Jose Ivan Vargas2017-12-191-1/+1
|
* Replaced some fork icons instances and fixed the Icon component on the MR WidgetJose Ivan Vargas2017-12-191-1/+1
|
* Add tooltip for milestone due date to issue and merge request listsVitaliy @blackst0ne Klachkov2017-09-201-1/+1
|
* Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-051-1/+1
|
* Clean up issuable listsTaurie Davis2017-06-291-37/+39
|
* Move issuable bulk edit form into a new sidebar.28340-mass-edit-issues-and-mrs-from-sidebarBryce Johnson2017-06-061-2/+2
|
* Consistently use monospace font for commit SHAs and branch and tag namesDouwe Maan2017-05-121-1/+1
|
* Gather issuable metadata to avoid n+ queries on index viewissue_25900_2Felipe Artur2017-02-091-16/+1
|
* fix alignment for long titleNur Rony2017-02-081-59/+60
|
* Align Segoe UI label text26059-segoe-ui-verticalAnnabel Dunstone Gray2017-02-071-1/+1
|
* Move issuable reference display to a helper methodOswaldo Ferreira2017-01-271-2/+1
|
* Present group and dashboard MR list without grouping by projectOswaldo Ferreira2017-01-271-1/+2
|
* HAMLLint: Fix `TrailingWhitespace` offencesKushal Pandya2016-12-311-1/+1
|
* Merge branch '24877-bulk-edit-only-keeps-common-labels-when-searching' into ↵Fatih Acet2016-12-151-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Improve bulk assignment This MR improves current implementation of Label dropdown when used for bulk assignment on issuable pages (/:namespace/:project/issues, /:namespace/:project/merge_requests) Previously this dropdown relied on `<input>` tags to get its active items and also to calculate items with indeterminate state. Relying on `<input>` tags is not enough when we want to set/get multiple states on a dropdown. For this case we want to get/set: - Marked items - Unmarked items that were initially marked - Unmarked items that were initially indeterminate - Items with indeterminate state. This MR makes the Label dropdown to save its own state as `data` so it will be easy to get and set whatever state we want no matter if the dropdown is filtering which is the issue that I initially wanted to solve as you can see in the following gif. **Before** ![2016-12-07_11.44.48](/uploads/cb697161b8b39cdee72fdbb95a531100/2016-12-07_11.44.48.gif) **After** ![2016-12-07_11.32.43](/uploads/338255a302de0dd1367474f33232d2a3/2016-12-07_11.32.43.gif) As you can see in the first gif the `bug` label is removed from the selected issues but the `enhancement` label should set but the `critical` should be kept. This is fixed on the next gif. Fixes #24877 See merge request !7765
| * Improve issuable's bulk assignment implementationAlfredo Sumaran2016-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the case when the user wants to add a label. The user has to use the dropdown’s filter input to look for a label and click it in order to see the bug. Step to reproduce - Select at least two issues, one label should be present in all issues, other label should be present in at least one. - On the label dropdown: Deselect label that is present in all issues, look for another issue using the filter input and click it. - Click on `Update issues` Before: Unmarked label were kept on selected issues. Now: Unmarked label is removed from selected issues
* | Merge branch 'jej-note-search-uses-finder' into 'security' Douwe Maan2016-12-151-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing Note access checks in by moving Note#search to updated NoteFinder Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867 ## Which fixes are in this MR? :warning: - Potentially untested :bomb: - No test coverage :traffic_light: - Test coverage of some sort exists (a test failed when error raised) :vertical_traffic_light: - Test coverage of return value (a test failed when nil used) :white_check_mark: - Permissions check tested ### Note lookup without access check - [x] :white_check_mark: app/finders/notes_finder.rb:13 :download_code check - [x] :white_check_mark: app/finders/notes_finder.rb:19 `SnippetsFinder` - [x] :white_check_mark: app/models/note.rb:121 [`Issue#visible_to_user`] - [x] :white_check_mark: lib/gitlab/project_search_results.rb:113 - This is the only use of `app/models/note.rb:121` above, but importantly has no access checks at all. This means it leaks MR comments and snippets when those features are `team-only` in addition to the issue comments which would be fixed by `app/models/note.rb:121`. - It is only called from SearchController where `can?(current_user, :download_code, @project)` is checked, so commit comments are not leaked. ### Previous discussions - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#b915c5267a63628b0bafd23d37792ae73ceae272_13_13 `: download_code` check on commit - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#b915c5267a63628b0bafd23d37792ae73ceae272_19_19 `SnippetsFinder` should be used - `SnippetsFinder` should check if the snippets feature is enabled -> https://gitlab.com/gitlab-org/gitlab-ce/issues/25223 ### Acceptance criteria met? - [x] Tests added for new code - [x] TODO comments removed - [x] Squashed and removed skipped tests - [x] Changelog entry - [ ] State Gitlab versions affected and issue severity in description - [ ] Create technical debt issue for NotesFinder. - Either split into `NotesFinder::ForTarget` and `NotesFinder::Search` or consider object per notable type such as `NotesFinder::OnIssue`. For the first option could create `NotesFinder::Base` which is either inherited from or which can be included in the other two. - Avoid case statement anti-pattern in this finder with use of `NotesFinder::OnCommit` etc. Consider something on the finder for this? `Model.finder(user, project)` - Move `inc_author` to the controller, and implement `related_notes` to replace `non_diff_notes`/`mr_and_commit_notes` See merge request !2035
* Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipelineGrzegorz Bizon2016-11-291-2/+2
|
* More aggressively preload on merge request and issue index pagesDouwe Maan2016-11-181-0/+3
|
* Always use symbols for type on LabelsHelper#link_to_labelDouglas Barbosa Alexandre2016-10-191-1/+1
|
* Remove duplication between global and the regular label partialsDouglas Barbosa Alexandre2016-10-191-1/+1
|
* Merge branch '18849-project-snippets-page-isn-t-really-responsive' into ↵Jacob Schatz2016-09-151-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update snippets UI ## What does this MR do? Updates snippets UI _(mainly mobile view)_ to new UI proposed in #18849. ## Are there points in the code the reviewer needs to double check? Does anyone know the implementation difference between `app/views/snippets/show.html.haml` and `app/views/projects/snippets/show.html.haml`? I have only been updating the latter as it's the only one I can find implemented. I assume the former is rendered somewhere seeing as there is controllers for it too. But this doesn't seem very DRY from my current perspective. ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-09-06_at_14.20.10](/uploads/ac124a3b0896872ce851b9f56fbe339c/Screen_Shot_2016-09-06_at_14.20.10.png) ![Screen_Shot_2016-09-06_at_14.20.32](/uploads/8d3c7b1d1a5f562ceb6dc22bde695289/Screen_Shot_2016-09-06_at_14.20.32.png) ![Screen_Shot_2016-09-06_at_14.20.48](/uploads/6b1c31ece6d2400bbfc3c673d9e82d4b/Screen_Shot_2016-09-06_at_14.20.48.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #18849 See merge request !6210
| * Reordered dropdown options18849-project-snippets-page-isn-t-really-responsiveLuke Bennett2016-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rearranged datetime created line Added `avatar_class` option to `link_to_member` so it can be hidden Made snippet title font heavier Added file title bar Hidden unneeded info from xs screens Added visibility icon Reveal file-actions on xs screens Added comments icon to snippets list items Refactored no-comments declaration into framework stylesheet Final touch ups Fixed snippets_spec
* | Add bulk update support for merge requests listDmitriy Zaporozhets2016-09-081-0/+4
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-061-1/+1
|\
| * Merge branch 'master' into awardablesZJ van de Weg2016-05-301-1/+1
| |\
| * \ Merge branch 'master' into awardablesZJ van de Weg2016-05-251-1/+1
| |\ \
| * | | Fix latests concernsZJ van de Weg2016-05-181-3/+3
| | | |
| * | | Incorporate feedbackZeger-Jan van de Weg2016-05-111-10/+4
| | | |
| * | | Create table for award emojiZeger-Jan van de Weg2016-05-061-1/+1
| | | |
* | | | Use pipelines in context of ProjectKamil Trzcinski2016-06-031-2/+2
| |_|/ |/| |
* | | Replace `link_to_gfm` with `link_to` in merge request and issue titles.link-to-in-issues-indexConnor Shea2016-05-241-1/+1
| |/ |/| | | | | | | | | | | | | | | | | Previously if an issue had an emoji for its name it would be unclickable. Similarly, links were rendered inline if the title was something like “Fixes a bug with https://google.com”. This confused some users, so it’s removed. On the issue/MR page itself, the formatting is preserved. This only effects index pages. This is also ever so slightly more performant :) This fixes #17614 and #17230.
* | Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-131-10/+4
|\ \
| * | Expose MergeRequest#user_notes_count in the API and use the method in issues ↵Rémy Coutable2016-05-091-10/+4
| |/ | | | | | | | | | | list Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-04-261-1/+1
|\ \ | |/
| * Do not include award emojis in issue view comment_counttheoretick2016-04-141-1/+1
| | | | | | | | Fixes Issue #14431
* | Improve rendered CI statusesKamil Trzcinski2016-04-131-1/+1
|/
* change the css class has_tooltip to has-tooltip universallychange_css_class_has_tooltip_to_has-tooltipArinde Eniola2016-03-201-1/+1
|
* Refactor colors and listsDmitriy Zaporozhets2016-03-181-3/+3
| | | | | | | | | | * Introduce 2 color links: black and blue * Use black color link for UI elements like lists * Refactor lists to use .title nested under li * Make all lists (events, todos, activity, projects etc) use style * List colorschema is now 333 for links and 555 for text Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Removed un-used variablesPhil Hughes2016-03-011-1/+1
|
* Replaced prefix with to_reference method callsPhil Hughes2016-03-011-1/+1
|
* Changed # to ! on merge requests on activity viewPhil Hughes2016-03-011-1/+1
| | | | Closes #9082
* Refactor styles for merge requests listDmitriy Zaporozhets2016-02-261-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>