summaryrefslogtreecommitdiff
path: root/app/views/projects/commit
Commit message (Collapse)AuthorAgeFilesLines
* Added dyanmic position adjustment22089-show-full-job-name-on-hover-on-pipeline-graphLuke Bennett2016-10-192-2/+2
| | | | | | | | Added tooltips for dropdown items Reverted pretty much everything in favour of a DOM approach Simplified JS
* Added tooltip with jobs full name to build items in graphLuke Bennett2016-10-181-1/+1
| | | | | | | | Added status to build tooltip and removed status icon tooltip Added Pipelines class to force tooltips ontop of the dropdown, we cannot do this with data attributes because dropdown toggle is already set Corrected dispatcher invocation
* Merge branch '18844-missing-subnavs-on-some-pages' into 'master' Fatih Acet2016-10-142-15/+21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added subnav to all views bar issuable views ## What does this MR do? Adds subnav to all views apart from issue and MR views. The full list is available in screenshots below. It also adds some JS to the builds page to simply handle the repositioning of the fixed position sidebar with the addition of the subnav. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ~UX and apparently ~regression . ## What are the relevant issue numbers? Closes #18844. ## Screenshots (if relevant) ### Label #### Edit ![Screen_Shot_2016-08-24_at_23.45.25](/uploads/3e5ded9e60f0eccc37672ab0a1423bfb/Screen_Shot_2016-08-24_at_23.45.25.png) #### New ![Screen_Shot_2016-08-24_at_23.45.13](/uploads/767c6e97c91a5ded904f5b495950f5a8/Screen_Shot_2016-08-24_at_23.45.13.png) ### Milestone #### Edit ![Screen_Shot_2016-08-24_at_23.45.37](/uploads/27562162415a6ae403e7117df009b208/Screen_Shot_2016-08-24_at_23.45.37.png) #### New ![Screen_Shot_2016-08-24_at_23.45.43](/uploads/43c655b0a2af9a8da335a2efc31cb2df/Screen_Shot_2016-08-24_at_23.45.43.png) #### Show ![Screen_Shot_2016-08-24_at_23.45.53](/uploads/68c3e0788c81f5897c7db11bb2b02a4c/Screen_Shot_2016-08-24_at_23.45.53.png) ### Commit #### Show ![Screen_Shot_2016-08-26_at_14.15.20](/uploads/9f96e0587e4866fa95e28c224a185844/Screen_Shot_2016-08-26_at_14.15.20.png) #### Builds ![Screen_Shot_2016-08-26_at_15.28.46](/uploads/9f0d8ababc8362874a3e2b5d877c7668/Screen_Shot_2016-08-26_at_15.28.46.png) ### Blob #### Blame ![Screen_Shot_2016-08-26_at_14.18.03](/uploads/2999f2cd304e3b9be6530a52407eca59/Screen_Shot_2016-08-26_at_14.18.03.png) #### Edit ![Screen_Shot_2016-08-26_at_14.20.32](/uploads/bb7b00bbe835228a8ec8b371e9364cb8/Screen_Shot_2016-08-26_at_14.20.32.png) ### Pipelines #### Show ![Screen_Shot_2016-08-26_at_15.44.30](/uploads/ee84c51597ab04a07a6c953704280e7b/Screen_Shot_2016-08-26_at_15.44.30.png) #### Show build ![Screen_Shot_2016-08-26_at_15.45.55](/uploads/dd78ef3dc083186095cdc84f41c80b21/Screen_Shot_2016-08-26_at_15.45.55.png) #### Edit Envrionment ![Screen_Shot_2016-08-26_at_15.48.33](/uploads/4e9340e11eedeaeddebb708f02db3598/Screen_Shot_2016-08-26_at_15.48.33.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 [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) Closes #18844 See merge request !5998
| * Added subnav to labels edit+new and milestones edit+new+show18844-missing-subnavs-on-some-pagesLuke Bennett2016-10-072-15/+21
| | | | | | | | | | | | | | | | | | | | Added subnav to blame show, blob edit, builds show, commit builds, commit show, environments edit and pipelines show Added subnav to new enviro view Added sidebar top position calculation logic Added sidebar translation to follow the subnav up when the body is scrolled until a certain limit
* | Merge branch '23167-min-row-height' into 'master' Fatih Acet2016-10-142-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Build/Pipeline/Environment List Inconsistency Row Height" #### What does this MR do? * Changes generic table class from `builds` to `ci-table`. It was getting confusing using `builds` for `builds`, `pipelines`, `environments` * Sets height on builds rows for continuity #### Are there points in the code the reviewer needs to double check? Apparently you can't set `min-height` on any `table` elements but you _can_ set `height`. For some reason, even if the content within happens to start wrapping, the row height will grow instead of letting the content overlap. Which is a good thing. Just kind of weird. #### Why was this MR needed? Different row heights on builds depending on content #### Screenshots (if relevant) Before: ![Screen_Shot_2016-10-10_at_4.49.58_PM](/uploads/a4edb584f95c670f9815a8e5b1d725ee/Screen_Shot_2016-10-10_at_4.49.58_PM.png) After: ![Screen_Shot_2016-10-10_at_4.32.03_PM](/uploads/488a84b4ed292fbbb0ea7e372c017ae0/Screen_Shot_2016-10-10_at_4.32.03_PM.png) Before: ![Screen_Shot_2016-10-10_at_4.44.23_PM](/uploads/3cbcbada89d1aeb1fea35ea9b851e370/Screen_Shot_2016-10-10_at_4.44.23_PM.png) After: ![Screen_Shot_2016-10-10_at_4.42.56_PM](/uploads/0cb573670f60c7fdf54fdb027c95639f/Screen_Shot_2016-10-10_at_4.42.56_PM.png) ## What are the relevant issue numbers? Closes #23167 See merge request !6787
| * | Replace generic table withAnnabel Dunstone Gray2016-10-102-2/+2
| |/
* | Allow scrolling within grouped pipelinesgrouped-builds-arrowAnnabel Dunstone Gray2016-10-111-5/+6
| |
* | Fix node flex alignmentAnnabel Dunstone Gray2016-10-101-2/+2
| |
* | JS review changes - Removed window from window.gl in dispatcherLuke Bennett2016-10-102-2/+2
| | | | | | | | | | | | Added page:load event as ready isnt fired by turbolinks Fix dropdown menu link click registration
* | Fix ul htmlAnnabel Dunstone Gray2016-10-101-2/+3
| |
* | Move hidden class to graph itself; remove background color from play node & ↵Annabel Dunstone Gray2016-10-101-2/+2
| | | | | | | | align icon
* | Finished up margin JS logicLuke Bennett2016-10-101-39/+40
| |
* | Added final changes from handoverLuke Bennett2016-10-102-10/+9
| |
* | Change size of pipeline status icons and dropdownsAnnabel Dunstone Gray2016-10-101-1/+2
|/
* Enable CacheMarkdownField for the remaining modelsNick Thomas2016-10-071-2/+2
| | | | | | | | | | | | | | | | | | | | This commit alters views for the following models to use the markdown cache if present: * AbuseReport * Appearance * ApplicationSetting * BroadcastMessage * Group * Issue * Label * MergeRequest * Milestone * Project At the same time, calls to `escape_once` have been moved into the `single_line` Banzai pipeline, so they can't be missed out by accident and the work is done at save, rather than render, time.
* Merge branch 'replace-bootstrap-caret' into 'master' Jacob Schatz2016-10-062-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace bootstrap caret with fontawesome caret ## What does this MR do? 1. Replaces all occurrences of `.caret` with fontawesome's caret (`fa-caret-down` for most cases) 2. Remove `.caret` from CSS 3. Refactored pipeline graph toggle to display the correct fontawesome caret (Had to change some JavaScript for this) ## Are there points in the code the reviewer needs to double check? * Need to check if I missed any pages :disappointed_relieved: or for any side effects ## Why was this MR needed? Resolves UI inconsistency ## Screenshots (if relevant) Before (1 example out of many): ![Screen_Shot_2016-09-12_at_3.49.58_PM](/uploads/5eb93bbcc00412a5875e39302f4d8ba0/Screen_Shot_2016-09-12_at_3.49.58_PM.png) After: ![Screen_Shot_2016-09-12_at_3.49.48_PM](/uploads/9259a9ebfb0bd09b4cfd55674e9b8be4/Screen_Shot_2016-09-12_at_3.49.48_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21169 See merge request !6314
| * Replace bootstrap caret with fontawesome caretClement Ho2016-10-052-2/+2
| |
* | Add tag shortcut from the Commit pageAkram FARES2016-10-061-0/+2
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Rearranged commit tabs and changed commit `Commit` column header to `Pipeline`pipelines-for-commitLuke Bennett2016-09-272-5/+5
| | | | Changed `Commit` column header to `Pipeline` on pipeline index
* Commit status icon now links to pipelines tab of commit viewLuke Bennett2016-09-271-1/+1
| | | | | | Removed commit from pipeline list items Used local_assigns and changed to positive naming ffor boolean props
* Add Pipelines for CommitKamil Trzcinski2016-09-273-1/+13
|
* Removed stages loop for a single 'Stages' header22472-wrong-table-headLuke Bennett2016-09-271-7/+1
|
* Fix spec failuresgroup-similarKamil Trzcinski2016-09-142-3/+3
|
* Re-use as much of views as possibleKamil Trzcinski2016-09-144-34/+26
|
* Style grouped builds dropdownAnnabel Dunstone Gray2016-09-071-7/+22
|
* Group similar buildsKamil Trzcinski2016-09-072-2/+19
|
* Remove redundant pipeline tooltipsClement Ho2016-08-301-1/+4
|
* Reduce number of database queries on builds tab13912-reduce-pipeline-db-queriesPaco Guzman2016-08-251-2/+2
|
* Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-08-202-2/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wall-clock-time-for-showing-pipeline * upstream/master: (50 commits) Increased vertical alignment of labels for issues in lists Changed file name Updated spec HAML Changed tests to use JS tests Addressed feedback Made logic simpler by moving away from underscorejs Added tooltip to label value in collapsed sidebar Add play icon SVG Have hover color of builds span full width Fix alignment of icon on commits page Change sleep to wait_for_ajax Added tests Destroy branch delete tooltip when row is removed Move and improvement comment in pipeline fixtures Fix notification_service argument error of declined invitation emails Update contribution acceptance criteria with tests requirements Fixed keyboard shortcuts not working on issue boards Hides tooltip when dragging Fixes issue with cursor not changing when dragging Hides tooltips when dragging issues Add a spec testing a second side effect of `Repository#merge`. drop execute bit ...
| * Merge branch 'cs-async-branch-dropdown' into 'master' Jacob Schatz2016-08-191-1/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load branch dropdowns asynchronously for cherry pick and revert dialogs ## Why was this MR needed and what does it do? Previously every commit page was loading every branch onto the page twice, once each for the Cherry Pick and Revert modal dialogs. Most of the time they're never used, so that's a bit of a waste. This loads them asynchronously by modifying the existing ref switcher code to also work for the branch selectors. This is better for performance. ## Are there points in the code the reviewer needs to double check? Make sure Cherry Picking and Reverting still work (from my tests they seem to be fine). ## What are the relevant issue numbers? Fixes #20108. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-01_at_4.35.21_PM](/uploads/6b76ea656fd00df52ab56df5309976dc/Screen_Shot_2016-08-01_at_4.35.21_PM.png) ![Screen_Shot_2016-08-01_at_4.35.52_PM](/uploads/d2699a4bfc4ad1a4d414429e7c50e60f/Screen_Shot_2016-08-01_at_4.35.52_PM.png) After: ![Screen_Shot_2016-08-01_at_4.32.49_PM](/uploads/5faa6494b10dd9ac5e8850763a0c4018/Screen_Shot_2016-08-01_at_4.32.49_PM.png) ![Screen_Shot_2016-08-01_at_4.32.56_PM](/uploads/87c490bb375244e7d72421fd55e13e3f/Screen_Shot_2016-08-01_at_4.32.56_PM.png) ![Screen_Shot_2016-08-01_at_4.33.02_PM](/uploads/59ae65c0afc39d8939a9f36431815854/Screen_Shot_2016-08-01_at_4.33.02_PM.png) ## Does this MR meet the acceptance criteria? - [x] [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 - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc: @iamphill @jschatz1 See merge request !5607
| | * Add dynamic sizing for dropdown toggle, update Changelog.Connor Shea2016-08-171-1/+1
| | | | | | | | | | | | Also resolve feedback.
| | * Make the ref-selector function work properly for branch selection.Connor Shea2016-08-171-7/+2
| | |
| | * Initial implementation of an async branch dropdown for Revert and Cherry Pick.Connor Shea2016-08-171-1/+8
| | |
| * | Merge branch 'fix-alignment-build-status-icon' into 'master' Jacob Schatz2016-08-191-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spacing and vertical alignment on build status icon on commits page ## What does this MR do? Fixes the hover state of the build status text and adds extra margin and vertically aligns the build status icon ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Improves existing UI ## What are the relevant issue numbers? Closes #20642 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-09_at_12.07.50_PM](/uploads/5265c00077eeef8fc42e08e89555bfb7/Screen_Shot_2016-08-09_at_12.07.50_PM.png) ![Screen_Shot_2016-08-09_at_12.07.59_PM](/uploads/dc5cf7e09785ac394b264a47c594cf98/Screen_Shot_2016-08-09_at_12.07.59_PM.png) After: ![Screen_Shot_2016-08-09_at_12.05.45_PM](/uploads/c0ce182c6342a7db767d1932372991d0/Screen_Shot_2016-08-09_at_12.05.45_PM.png) ![Screen_Shot_2016-08-09_at_12.05.37_PM](/uploads/e337ff23462552f75760f80087a2b1ef/Screen_Shot_2016-08-09_at_12.05.37_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5739
| | * | Fix spacing and vertical alignment on build status icon on commits pageClement Ho2016-08-101-1/+2
| | | |
* | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-08-192-1/+38
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wall-clock-time-for-showing-pipeline * upstream/master: (554 commits) Fix expansion of discussions in diff Improve performance of MR show page Fix jumping between discussions on changes tab Update doorkeeper to 4.2.0 Fix MR note discussion ID Handle legacy sort order values Refactor `find_for_git_client` and its related methods. Remove right margin on Jump button icon Fix bug causing “Jump to discussion” button not to show Small refactor and syntax fixes. Removed unnecessary service for user retrieval and improved API error message. Added documentation and CHANGELOG item Added checks for 2FA to the API `/sessions` endpoint and the Resource Owner Password Credentials flow. Fix behavior around commands with optional arguments Fix behavior of label_ids and add/remove_label_ids Remove unneeded aliases Do not expose projects on deployments Incorporate feedback Docs for API endpoints Expose project for environments ...
| * | | Remove index from pipeline toggles18141-pipeline-graphAnnabel Dunstone2016-08-171-1/+1
| | | |
| * | | Merge master into branchAnnabel Dunstone2016-08-171-0/+17
| |\ \ \
| | * | | Hide branch name and status text on mr pipelines; don't use shorter timeagoAnnabel Dunstone2016-08-161-1/+1
| | | | |
| | * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2016-08-163-4/+4
| | |\ \ \ | | | | |/ | | | |/| | | | | | 18681-pipelines-merge-request
| | * | | Display all pipelines for Merge RequestAnnabel Dunstone2016-07-251-1/+1
| | | | |
| | * | | Update MR pipeline viewAnnabel Dunstone2016-07-251-53/+16
| | | | |
| | * | | Add route, controller action, and views for MR pipelinesAnnabel Dunstone2016-07-251-0/+54
| | | | |
| * | | | Add support for Play and Created jobsKamil Trzcinski2016-08-171-9/+5
| | | | |
| * | | | Add links to pipeline graphAnnabel Dunstone2016-08-161-1/+1
| | | | |
| * | | | Add toggle button to hide graph; set max-heightAnnabel Dunstone2016-08-161-21/+25
| | | | |
| * | | | Fix graph scrolling bugAnnabel Dunstone2016-08-161-3/+2
| | | | |
| * | | | Truncate build and stage namesAnnabel Dunstone2016-08-161-14/+17
| | | | |
| * | | | Connect top level tests to each otherAnnabel Dunstone2016-08-161-5/+11
| | | | |
| * | | | Add build data to top of pipeline pageAnnabel Dunstone2016-08-161-0/+12
| | |/ / | |/| |