summaryrefslogtreecommitdiff
path: root/app/views/projects/commit
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '26810-fix-undefined-method-revert_group_project_commit_path' ↵Robert Speicher2017-01-191-1/+1
|\ | | | | | | | | | | | | | | | | | | into 'master' Ensure group acts as a namespace for polymorphic routes Closes #26810 See merge request !8627
| * Ensure group acts as a namespace for polymorphic routes26810-fix-undefined-method-revert_group_project_commit_pathRémy Coutable2017-01-181-1/+1
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '26117-sort-pipeline-for-commit' into 'master' Kamil Trzciński2017-01-192-2/+2
|\ \ | |/ |/| | | | | | | | | Add sorting pipelines for a commit Closes #26117 See merge request !8319
| * Add sorting pipeline for a commitTakuya Noguchi2017-01-192-2/+2
| |
* | Update clipboard_button text: Copy commit SHA to clipboardclipboard-button-commit-shavictorwu2017-01-171-1/+1
| |
* | Mark Commit persistedpmq20/gitlab-ce-psvr/persistedP.S.V.R2017-01-161-1/+1
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Adds back removed class in merge request pipelines tableFilipa Lacerda2017-01-051-1/+1
|
* Removes invalid html and unneed CSS to prevent shaking in the pipelines tab26278-shaking-tab-pipelines-viewFilipa Lacerda2017-01-031-2/+2
| | | | Updates CHANGELOG entry with MR ID
* HAMLLint: Fix `SpaceInsideHashAttributes` offencesKushal Pandya2016-12-312-4/+4
|
* HAMLLint: Fix `ImplicitDiv` offencesKushal Pandya2016-12-311-1/+1
|
* Remove builds tab from commitFilipa Lacerda2016-12-213-15/+0
| | | | | | Remove unused file Fix commit link
* Makes API call when stage is clickedFilipa Lacerda2016-12-191-1/+1
|
* CSS - Adds background color.Filipa Lacerda2016-12-151-7/+7
| | | | | | | | | | | | | | | | | | | | Removes unused CSS Fix scss linter errors Adds changelog entry Increase icons size. Adds transition animation Fix jumping icon. Reduce icon size Fix columns width Changes after review Fix transition
* Clean up commit copy to clipboard and make consistentvictorwu2016-12-121-7/+2
|
* Merge branch '25429-fix-awkward-wording-in-cherry-pick-and-revert-errors' ↵Alfredo Sumaran2016-12-121-5/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Fix awkward wording in "cherry-pick" and "revert" errors." ## What does this MR do? Fixes a poorly worded error message as well as some other minor bugs I encountered while investigating #21812. ## Are there points in the code the reviewer needs to double check? Should be pretty straight forward. ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] ~~[Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 - [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 it does - 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? Originally a part of #21812 Closes #25429 See merge request !7981
| * 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
| |
* | Fix Pipeline graph disappeared from the builds tab in commits and merge ↵Filipa Lacerda2016-12-121-1/+1
|/ | | | request views
* 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
View Lorry Controller Status