summaryrefslogtreecommitdiff
path: root/app/controllers/projects/commit_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
* DRY up diff_for_path actionsSean McGivern2016-07-081-34/+27
| | | | | | 1. Move render method to a concern, not a helper. 2. Let DiffHelper#diff_options automatically add the path option. 3. Move more instance var definitions to before filters.
* Collapse large diffs by defaultSean McGivern2016-07-081-1/+19
| | | | | When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead.
* Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-061-1/+0
|
* Fix rendering of commit notesDouwe Maan2016-06-271-1/+8
|
* Added initial version of deploymentsKamil Trzcinski2016-06-101-1/+1
|
* Rename all ci_commit[s] in application code to pipeline[s]Kamil Trzcinski2016-06-031-5/+5
|
* Fix other places where we still use commit attribute of BuildKamil Trzcinski2016-06-031-3/+3
|
* Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski2016-06-021-1/+1
|
* Satisfy RubocopDouwe Maan2016-05-131-1/+1
|
* Use `@diff_notes_disabled` instead of `@comments_allowed`Douwe Maan2016-05-131-1/+0
|
* Extract LegacyDiffNote out of NoteDouwe Maan2016-05-131-5/+6
|
* Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński2016-04-211-5/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix specsKamil Trzcinski2016-04-111-2/+6
| |
| * Use Ci::Commit as PipelineKamil Trzcinski2016-04-111-3/+4
| |
* | Add support to cherry-pick any commitP.S.V.R2016-04-181-13/+17
|/ | | | | Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785 Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
* Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-031-5/+4
|
* More updates from the last code review.Rubén Dávila2016-02-191-1/+2
|
* Update copy and URLs used when reverting MRs.Rubén Dávila2016-02-191-3/+23
|
* Check that target_branch is present.Rubén Dávila2016-02-191-1/+1
|
* Make MRs with revert commit work.Rubén Dávila2016-02-191-2/+5
|
* Add RevertService class with basic logic to revert commitRubén Dávila2016-02-191-0/+13
|
* Add button to revert commit on Commit detail page.Rubén Dávila2016-02-191-0/+7
|
* Ensure Commit#show responds 404 instead of 500 when given an invalid IDrs-issue-13467Robert Speicher2016-02-151-2/+2
| | | | Closes #13467
* Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-02-091-9/+3
|\
| * Make the CI permission model simplerKamil Trzcinski2016-02-021-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | This MR simplifies CI permission model: - read_build: allows to read a list of builds, artifacts and trace - update_build: allows to cancel and retry builds - create_build: allows to create builds from gitlab-ci.yml (not yet implemented) - admin_build: allows to manage triggers, runners and variables - read_commit_status: allows to read a list of commit statuses (including the overall of builds) - create_commit_status: allows to create a new commit status using API Remove all extra methods to manage permission. Made all controllers to use explicitly the new permissions.
* | Remember user's inline/tabular diff view preference in a cookiekkm2016-02-051-0/+2
|/
* Merge branch 'master' into issue_3945Douwe Maan2016-01-201-1/+1
|\
| * Give reporters the ability to download artifacts.Andrew Johnson2016-01-151-1/+1
| | | | | | | | Also fix a few places where page_404 should be render_404.
* | More refactoring from last code review. #3945Rubén Dávila2016-01-141-1/+1
| | | | | | | | | | | | * Use commit objects instead of IDs when generating diffs * Use proper references when generating MR's source and target * Update broken specs
* | Use current commit id if it doesn't have a parent. #3945Rubén Dávila2016-01-131-1/+1
| |
* | Change strategy to highlight diffs. #3945Rubén Dávila2016-01-071-0/+1
|/ | | | | Now we apply syntax highlighting to the whole old and new files. This basically help us to highlight adequately multiline content.
* Migrate CI::Project to ProjectKamil Trzcinski2015-12-111-1/+0
|
* Move commit builds to partialDouwe Maan2015-12-081-4/+4
|
* Add ignore whitespace change option to commit viewMinsik Yoon2015-12-011-1/+6
|
* CI details cleanupKamil Trzcinski2015-11-051-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | - Add page titles to CI settings. - Fix CI admin navigation. - Remove duplicated scope. - Use monospace font for commit sha. - Add page title and header title to build page. - Proper authorization for cancel/retry builds. - Use gitlab pagination theme for builds and group members. - Don't paginate builds widget on build page. - Add badges to commit page Changes/Builds tabs. - Add "Builds" to commit Builds tab page title. - Add and use Ci::Build#retryable? method. - Add CI::Build#retried? method. - Allow all failed commit builds to be retried. - Proper authorization for cancel/retry all builds. - Remove unused param. - Use time_ago_with_tooltip where appropriate. - Tweak builds index text - Remove duplication between builds/build and commit_statuses/commit_status. - Use POST rather than GET for canceling and retrying builds. - Remove redundant URL helpers. - Add build ID to build page. - Link branch name on build page. - Move commit/:sha/ci to commit/:sha/builds.
* Allow developer to manage buildsKamil Trzcinski2015-10-231-1/+10
|
* Fix tests and few CI featuresDmitriy Zaporozhets2015-10-071-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove Ci::Commit and Ci::Build controllerscleanup-ci-pagesDmitriy Zaporozhets2015-10-071-0/+8
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Render CI statuses on commit pageDmitriy Zaporozhets2015-10-061-0/+7
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Show CI status on commit pageDmitriy Zaporozhets2015-09-241-0/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* No longer needed to pass project argument to commit methods.Douwe Maan2015-04-241-3/+3
|
* Use project.commit convenience method.Douwe Maan2015-04-241-1/+1
|
* Fixed the Rails/ActionFilter copJeroen van Baarsen2015-04-201-3/+3
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Clean up code around commit mentions.Douwe Maan2015-04-151-3/+3
|
* Move 'require_non_empty_project' filter to front so 'assign_ref_vars' ↵Douwe Maan2015-02-201-1/+1
| | | | doesn't 404.
* Commit page: async load branches infoValery Sizov2015-02-031-2/+6
| | | | | Conflicts: config/routes.rb
* Show tags in commit viewHannes Rosenögger2015-01-171-0/+1
|
* remove auth duplicationValery Sizov2014-11-051-1/+0
|
* Merge pull request #8030 from cirosantilli/factor-authorizeDmitriy Zaporozhets2014-10-211-1/+1
|\ | | | | Factor authorize_push! and authorize_code_access!
| * Factor authorize_push! and authorize_code_access!Ciro Santilli2014-10-131-1/+1
| | | | | | | | | | with existing method_missing. Pattern already used extensively, so let's be consistent and use it everywhere.
View Lorry Controller Status