summaryrefslogtreecommitdiff
path: root/app/views/projects/commit
Commit message (Collapse)AuthorAgeFilesLines
* prevent create_merge_request form field helpers from generating an id value25429-fix-awkward-wording-in-cherry-pick-and-revert-errorsMike Greiling2016-12-101-2/+2
|
* remove unnecessary nonce idMike Greiling2016-12-101-3/+2
|
* fix broken string interpolationMike Greiling2016-12-101-1/+1
|
* Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security'Douwe Maan2016-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace MR access checks with use of MergeRequestsFinder Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867 :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 - [x] :bomb: app/finders/notes_finder.rb:17 - [x] :warning: app/views/layouts/nav/_project.html.haml:80 [`.count`] - [x] :bomb: app/controllers/concerns/creates_commit.rb:84 - [x] :traffic_light: app/controllers/projects/commits_controller.rb:24 - [x] :traffic_light: app/controllers/projects/compare_controller.rb:56 - [x] :vertical_traffic_light: app/controllers/projects/discussions_controller.rb:29 - [x] :white_check_mark: app/controllers/projects/todos_controller.rb:27 - [x] :vertical_traffic_light: app/models/commit.rb:268 - [x] :white_check_mark: lib/gitlab/search_results.rb:71 - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_267_266 Memoize ` merged_merge_request(current_user)` - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_248_247 Expected side effect for `merged_merge_request!`, consider `skip_authorization: true`. - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_269_269 Scary use of unchecked `merged_merge_request?` See merge request !2033
* Fix specspipeline-stageKamil Trzcinski2016-12-071-1/+1
|
* Move .pipeline-graph to pipelines/graphKamil Trzcinski2016-12-071-1/+1
|
* Code reviewKamil Trzcinski2016-12-071-3/+2
|
* Update stage rendering viewsKamil Trzcinski2016-12-063-40/+3
|
* Introduce `Ci::Stage`, right now this is artificial object that is build ↵Kamil Trzcinski2016-12-062-23/+6
| | | | dynamically.
* Support pipelines APIKamil Trzcinski2016-12-062-2/+2
| | | | Pass `updated_at` to get only incremental changes since last update
* sort pipeline graph builds and build groups by nameMike Greiling2016-11-221-1/+1
|
* Converted all status icons to be managed by scss colors only and deleted any ↵Dimitrie Hoekstra2016-11-222-2/+2
| | | | classes or styles within the svg's, plus gave status badges a hover style only if clickable
* Merge branch 'pipelines-page-redesign' into 'master' Fatih Acet2016-11-182-10/+7
|\ | | | | | | | | | | | | | | Pipelines page redesign Closes #23637 ![Screen_Shot_2016-11-15_at_1.36.34_PM](/uploads/edc6a58f00cca3e03ffd1689bd6eebd8/Screen_Shot_2016-11-15_at_1.36.34_PM.png) See merge request !7487
| * Create separate view for pipeline view with tabsAnnabel Dunstone Gray2016-11-153-47/+75
| |
| * Make pipeline page header responsive; add build counter; add short shaAnnabel Dunstone Gray2016-11-142-67/+51
| |
| * Remove builds tab from merge requests and commitsAnnabel Dunstone Gray2016-11-142-13/+0
| |
| * Rearrange and style items on pipeline pageAnnabel Dunstone Gray2016-11-101-24/+15
| |
| * Move reusable well styles into their own fileAnnabel Dunstone Gray2016-11-101-3/+3
| |
| * Remove toggle graph JS; put pipeline and builds in separate tabsAnnabel Dunstone Gray2016-11-101-40/+47
| |
* | only display link to pipeline in generic build index, not on pipeline showMike Greiling2016-11-102-3/+2
| |
* | add missing column header for pipeline builds viewMike Greiling2016-11-102-3/+4
|/
* Make toggle pipeline btn into button elementAnnabel Dunstone Gray2016-11-101-1/+1
|
* Update commit page stylesAnnabel Dunstone Gray2016-11-041-29/+28
|
* added various changes to commit title areaDimitrie Hoekstra2016-11-041-46/+47
|
* Display last pipeline infoAnnabel Dunstone Gray2016-10-281-1/+1
|
* Fix commits specAnnabel Dunstone Gray2016-10-281-3/+3
|
* Fix mobile viewAnnabel Dunstone Gray2016-10-281-2/+2
|
* Finish styling commits viewAnnabel Dunstone Gray2016-10-284-14/+19
|
* Rearrange commit info viewAnnabel Dunstone Gray2016-10-281-33/+33
|
* Remove tooltips from build nodes23868-build-graph-tooltipsAnnabel Dunstone Gray2016-10-261-1/+1
|
* Show full status link on MR & commit pipelinesAnnabel Dunstone Gray2016-10-241-1/+1
|
* Merge branch '22089-show-full-job-name-on-hover-on-pipeline-graph' into ↵Annabel Dunstone Gray2016-10-201-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add tooltip with jobs full name to pipelines graph ## What does this MR do? This MR adds a tooltip to build items in the pipelines graph as some build names are truncated. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Some job names that are truncated need to be fully identified to avoid confusion. ## Screenshots (if relevant) [Latest screenies here!](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6403#note_16968703). ## 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 #22089 See merge request !6403
| * 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 '19991-triggered-pipeline' into 'master' Jacob Schatz2016-10-181-0/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Triggered pipelines #### What does this MR do? Separates trigger into its own column #### Screenshots (if relevant) ![Screen_Shot_2016-10-07_at_4.21.54_PM](/uploads/092e8205d329b66b34045fe17c5e6e4f/Screen_Shot_2016-10-07_at_4.21.54_PM.png) ![Screen_Shot_2016-10-17_at_9.13.10_AM](/uploads/7df90e0e2a07a9f282df3605787d3cc2/Screen_Shot_2016-10-17_at_9.13.10_AM.png) ![Screen_Shot_2016-10-17_at_9.15.07_AM](/uploads/b7dc0307c8549e72c3f812c3cd91833a/Screen_Shot_2016-10-17_at_9.15.07_AM.png) #### What are the relevant issue numbers? Closes #19991 See merge request !6753
| * Add separate pipeline and commit columnsAnnabel Dunstone Gray2016-10-101-0/+1
| |
* | 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