summaryrefslogtreecommitdiff
path: root/app/views/projects/commit/show.html.haml
Commit message (Collapse)AuthorAgeFilesLines
* Added limit-container-width to breadcrumbs containerbreadcrumbs-limit-widthPhil Hughes2017-07-111-0/+1
| | | | | | | | This fixes an issue where the content has a limited width but the breadcrumbs remained full width. Instead of creating a new variable specifically for the breadcrumbs, it just re-uses @content_class Closes #34573
* Limit the width of commit & snippet comment sectionsPhil Hughes2017-06-231-5/+6
|
* Fix user and issues autocomplete in diff notesKushal Pandya2017-05-241-1/+1
|
* Support comments for personal snippetsJarka Kadlecova2017-05-051-1/+1
|
* Fixed HAML lintPhil Hughes2017-04-241-1/+1
|
* Commit view correctly spans the full width when parallel viewPhil Hughes2017-04-241-1/+3
| | | | Closes #30881
* Add option to start a new discussion on an MRDouwe Maan2017-04-051-0/+1
|
* Add 'View on [env]' link to blobs and individual files in diffsDouwe Maan2017-02-061-1/+1
|
* HAMLLint: Fix `ImplicitDiv` offencesKushal Pandya2016-12-311-1/+1
|
* Finish styling commits viewAnnabel Dunstone Gray2016-10-281-2/+1
|
* Added subnav to labels edit+new and milestones edit+new+show18844-missing-subnavs-on-some-pagesLuke Bennett2016-10-071-11/+14
| | | | | | | | | | 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
* Introduce Compare model in the codebase.Paco Guzman2016-08-031-1/+1
| | | This object will manage Gitlab::Git::Compare instances
* Cache highlighted diff lines for merge requestsPaco Guzman2016-08-031-1/+1
| | | | Introducing the concept of SafeDiffs which relates diffs with UI highlighting.
* Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-061-2/+1
|
* Remove header title from project pagesDmitriy Zaporozhets2016-05-261-2/+0
| | | | | | | With new navigation design it makes no sense to duplicate title in the header Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński2016-04-211-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci::Commit becomes a Pipeline object 1. Ci::Commit receives context: ref, :tag. 1. One Ci::Commit describes a one Pipeline 1. Pipeline is created from `.gitlab-ci.yml` 1. Pipeline is a ordered group of builds 1. We test MR against Pipeline 1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future) 1. We add a Pipeline Hook that will be triggered on Pipeline status change (future) 1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future) After merging that I'll prepare a separate MR that will unify naming, database columns, table names: ``` Ci::Commit -> Pipeline Ci::Build -> Build CommitStatus -> Job GenericCommitStatus -> ExternalJob ci_commits -> pipelines ci_builds -> jobs ``` This MR implements first 5 points. This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149. See merge request !3653
| * Use Ci::Commit as PipelineKamil Trzcinski2016-04-111-1/+1
| |
* | Add support to cherry-pick any commitP.S.V.R2016-04-181-1/+2
|/ | | | | Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785 Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
* Some updates from last code review.Rubén Dávila2016-02-191-1/+1
|
* Use a custom title in the revert modal.Rubén Dávila2016-02-191-1/+1
|
* Reuser revert commit modal in MR detail page.Rubén Dávila2016-02-191-1/+1
|
* Add button to revert commit on Commit detail page.Rubén Dávila2016-02-191-0/+2
|
* Merge branch 'master' into issue_3945Rubén Dávila2016-01-141-2/+6
|\
| * Replace all navigation menu with nav-links classDmitriy Zaporozhets2016-01-131-1/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add Open Graph data for group, project and commit.Douwe Maan2015-12-251-1/+3
| |
* | Change strategy to highlight diffs. #3945Rubén Dávila2016-01-071-1/+2
|/ | | | | Now we apply syntax highlighting to the whole old and new files. This basically help us to highlight adequately multiline content.
* Remove double border between gray blocksDouwe Maan2015-12-021-1/+4
|
* Don't use params[:view] directly.param-viewDouwe Maan2015-11-171-1/+1
|
* Render CI statuses on commit pageDmitriy Zaporozhets2015-10-061-0/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move project header title definition to view in question.Douwe Maan2015-09-171-0/+1
|
* Support commenting on a diff in side-by-side viewStan Hu2015-06-161-1/+1
| | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9283
* Include commit message in page title.Douwe Maan2015-04-301-1/+1
|
* Add a page title to every page.Douwe Maan2015-04-301-0/+1
|
* Use new diff parsing logicDmitriy Zaporozhets2014-09-081-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor diff suppress logic and diff viewsDmitriy Zaporozhets2014-07-151-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into ↵Dmitriy Zaporozhets2013-07-301-1/+1
|\ | | | | | | | | | | | | | | | | karlhungus-mr-on-fork Conflicts: app/views/projects/commit/show.html.haml app/views/projects/compare/show.html.haml app/views/projects/merge_requests/branch_from.js.haml
| * MR on Fork multiple fixesIzaak Alpert2013-07-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Disable observers post test run -Allow db:seed_fu RAILS_ENV=test to be run more than once without error -fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned -make notes/commits render against proper project -MR discussion file links should reference note's project -Added tests for commit links on edit merge request -fixes edit issues (canceling an edited mr, updating an edited mr) -updates tests with checks for source code updates -still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set) MR API: error on bad target_project -If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target -Fixes some busted (but hidden) test cases Conflicts: app/views/merge_requests/show/_diffs.html.haml spec/features/notes_on_merge_requests_spec.rb Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
* | squash commit summary in one sentenceDmitriy Zaporozhets2013-07-181-8/+0
|/
* Move projects controllers/views in Projects moduleDmitriy Zaporozhets2013-06-231-0/+11