summaryrefslogtreecommitdiff
path: root/app/controllers/projects/commit_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
* Fix cherry-picking or reverting through an MRDouwe Maan2017-03-021-12/+20
|
* Merge branch 'route-map' into 'master' Robert Speicher2017-02-071-0/+2
|\ | | | | | | | | Add 'View on [env]' link to blobs and individual files in diffs See merge request !8867
| * Address feedbackDouwe Maan2017-02-061-3/+2
| |
| * Improve performance of finding last deployed environmentDouwe Maan2017-02-061-1/+1
| |
| * Add 'View on [env]' link to blobs and individual files in diffsDouwe Maan2017-02-061-0/+3
| |
* | Moves pagination to shared folderFilipa Lacerda2017-02-031-1/+0
|/ | | | | | | | | | | | | | | | | | | Document and remove unused code Declare components in a consistent way; Use " instead of ' to improve consistency; Update documentation; Fix commit author verification to match the use cases; Adds tests for the added components Fix paths in pagination spec Adds tests to pipelines table used in merge requests and commits Use same resource interceptor Fix eslint error
* Merge remote-tracking branch 'upstream/master' into ↵fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-021-0/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (190 commits) Remove unnecessary returns / unset variables from the CoffeeScript -> JS conversion. update spec Change the reply shortcut to focus the field even without a selection. use destroy_all Remove settings cog from within admin scroll tabs; keep links centered add changelog remove old project members from project add spec replicating validation error Fix small typo on new branch button spec Improve styling of the new issue message Don't capitalize environment name in show page Abillity to promote project labels to group labels Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles Update and pin the `jwt` gem to ~> 1.5.6 refactor merge request build service Update index.md Clarify that Auto Deploy requires a public project. 19164 Add settings dropdown to mobile screens cop for gem fetched from a git source Add CHANGELOG entry ...
| * Expose serialized pipelines for commit pipelinesGrzegorz Bizon2017-01-271-0/+11
| |
* | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-01-261-5/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (1122 commits) Update CHANGELOG.md for 8.16.2 Display project ID in project settings (!8572) fixed points from comments to improve code quality Update CHANGELOG.md for 8.14.8 Statisfy eslint Add CHANGELOG entry Fix access to the wiki code via HTTP when repository feature disabled Display fullscreen button on small screens (!5302) Prevent removing fields from dropdowns on input elements fix for all themes Return struct instead of multiple values Fix race conditions for AuthorizedProjectsWorker Add User#nested_groups and User#nested_projects methods Fix spec failure due to timestamp ordering issue in mySQL Fixed error with filter keyboard tests `can?` already includes the `feature_available?` check Test there is no Merge Request button when MRs are disabled Ensure the correct Merge Request button is found Add 409 conflict tests Add CHANGELOG ...
| * Add sorting pipeline for a commitTakuya Noguchi2017-01-191-5/+0
| |
* | Just trust set_commit_variables to set everything!Lin Jen-Shin2017-01-061-5/+3
|/ | | | | | | | Removing those weird setup in assign_change_commit_vars fixed all the failures in the tests. I still cannot say why but clearly we need to have better names. It's so confusing right now. We should seriously stop fiddling those instance variables.
* Changes after reviewFilipa Lacerda2016-12-211-1/+1
| | | | | | Fix broken test Remove spinach tests for the builds tab
* Remove builds tab from commitFilipa Lacerda2016-12-211-29/+2
| | | | | | Remove unused file Fix commit link
* Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security'Douwe Maan2016-12-081-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Add Pipelines for CommitKamil Trzcinski2016-09-271-8/+9
|
* Fix autocomplete on commit and issue/MR edit pagesDouwe Maan2016-08-121-1/+1
|
* Pre-create all builds for Pipeline when a trigger is receivedKamil Trzcinski2016-08-111-2/+2
| | | | | | | | | | | This change simplifies a Pipeline processing by introducing a special new status: created. This status is used for all builds that are created for a pipeline. We are then processing next stages and queueing some of the builds (created -> pending) or skipping them (created -> skipped). This makes it possible to simplify and solve a few ordering problems with how previously builds were scheduled. This also allows us to visualise a full pipeline (with created builds). This also removes an after_touch used for updating a pipeline state parameters. Right now in various places we explicitly call a reload_status! on pipeline to force it to be updated and saved.
* switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-031-2/+2
| | | | So we have raw_diffs too
* Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-031-2/+2
| | | Instead calling diff_collection.count use diff_collection.size which is cache on the diff_collection
* Cache highlighted diff lines for merge requestsPaco Guzman2016-08-031-2/+2
| | | | Introducing the concept of SafeDiffs which relates diffs with UI highlighting.
* Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-201-2/+2
|
* 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
View Lorry Controller Status