summaryrefslogtreecommitdiff
path: root/app/models/commit.rb
Commit message (Collapse)AuthorAgeFilesLines
* Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testingAlejandro Rodríguez2017-04-111-8/+7
|
* Add option to start a new discussion on an MRDouwe Maan2017-04-051-0/+5
|
* Merge branch 'feature/use-gitaly-for-commit-show' into 'master'Robert Speicher2017-03-171-1/+8
|\ | | | | | | | | Use Gitaly for CommitController#show See merge request !9629
| * Use Gitaly for CommitController#showfeature/use-gitaly-for-commit-showAhmad Sherif2017-03-151-1/+8
| |
* | Adds pipeline mini-graph to system information box in Commit ViewFilipa Lacerda2017-03-161-0/+4
|/
* Revert "Enable Style/BarePercentLiterals"Douwe Maan2017-02-231-1/+1
| | | | This reverts commit 96bef54154e669f9a3e92c3a4bc76c0be3a52e48.
* Enable Style/ClassCheckDouwe Maan2017-02-231-1/+1
|
* Fix code for copsDouwe Maan2017-02-231-5/+6
|
* Enable Style/ConditionalAssignmentDouwe Maan2017-02-231-3/+3
|
* Enable Style/ColonMethodCallDouwe Maan2017-02-231-1/+1
|
* Enable Style/BarePercentLiteralsDouwe Maan2017-02-231-1/+1
|
* Enable Style/MutableConstantDouwe Maan2017-02-231-1/+1
|
* Present TODO's list without grouping by projectOswaldo Ferreira2017-01-271-2/+2
|
* Allows to search within project by commit's hashYarNayar2017-01-241-3/+8
| | | | Was proposed in #24833
* Mark MR as WIP when pushing WIP commitsjurre2017-01-191-0/+6
|
* Mark Commit persistedpmq20/gitlab-ce-psvr/persistedP.S.V.R2017-01-161-0/+8
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Fix cross-project references copy to include the project referencefix/cross-project-ref-pathJames Lopez2017-01-031-4/+4
| | | | Also added relevant specs and refactored to_references in a bunch of places to be more consistent.
* Introduce latest_status and add a few testsLin Jen-Shin2016-12-141-2/+2
| | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333#note_20003268
* Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-141-25/+42
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show-commit-status-from-latest-pipeline * upstream/master: (557 commits) Fix wrong error message expectation in API::Commits spec Move admin settings spinach feature to rspec Encode when migrating ProcessCommitWorker jobs Prevent overflow with vertical scroll when we have space to show content Make rubocop happy API: Ability to cherry-pick a commit Be smarter when finding a sudoed user in API::Helpers Backport hooks on group policies for the EE-specific implementation API: Ability to get group's project in simple representation Add AddLowerPathIndexToRoutes to setup_postgresql.rake For single line git commit messages, the close quote should be on the same line as the open quote added border-radius and padding to labels Allow all alphanumeric characters in file names (!8002) Add failing test for #20190 Don't allow blank MR titles in API Replace static fixture for awards_handler_spec (!7661) Crontab typo '* */6' -> '0 */6' (4x/day not 1x-per-min-for-1h 4x/day) Fix test Tweak style and add back wording Clean up commit copy to clipboard and make consistent ...
| * Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security'Douwe Maan2016-12-081-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 shorthand support to gitlab markdown referencesOswaldo Ferreira2016-12-021-10/+12
| |
| * Pass commit data to ProcessCommitWorkerprocess-commit-worker-improvementsYorick Peterse2016-12-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | By passing commit data to this worker we remove the need for querying the Git repository for every job. This in turn reduces the time spent processing each job. The migration included migrates jobs from the old format to the new format. For this to work properly it requires downtime as otherwise workers may start producing errors until they're using a newer version of the worker code.
* | Rename latest_for to latest, feedback:Lin Jen-Shin2016-11-241-1/+1
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333/diffs#note_18819292
* | Still use compound pipeline status, but group byLin Jen-Shin2016-11-211-7/+1
| | | | | | | | | | | | ref and sha so that it would show latest pipeline if ref and sha are both specified, otherwise still the same as before.
* | Show commit status from latest pipelineLin Jen-Shin2016-11-081-7/+9
|/ | | | | | Rather than compound status from all pipelines. Closes #20560
* Initialize @statuses in status rather than constructorLin Jen-Shin2016-11-031-1/+2
| | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17742312
* Merge status_for and status, feedback:Lin Jen-Shin2016-11-031-5/+1
| | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17742297
* It's not used as a public API right now, feedback:Lin Jen-Shin2016-10-281-5/+4
| | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17522443
* Still show status from pipelines, see:Lin Jen-Shin2016-10-271-7/+14
| | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17397201 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17397461 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6801#note_17468470 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17482654
* Pass `@ref` along so we know which pipeline to showLin Jen-Shin2016-10-241-0/+4
| | | | Closes #23615
* Use JavaScript tooltips for mentions (!5301)winniehell2016-09-011-9/+0
|
* Fix line commenting for the initial commitSean McGivern2016-08-191-1/+1
| | | | | The initial commit doesn't have a parent, so explicitly pass the blank SHA and handle that when calculating the position.
* Speed up Commit#repo_changesAhmad Sherif2016-08-031-1/+1
|
* switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-031-3/+7
| | | | So we have raw_diffs too
* Introduce Compare model in the codebase.Paco Guzman2016-08-031-1/+1
| | | This object will manage Gitlab::Git::Compare instances
* Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-031-0/+4
| | | Instead calling diff_collection.count use diff_collection.size which is cache on the diff_collection
* Expand commit message width in repo viewClement Ho2016-08-021-6/+8
|
* Add specs for caching commit authorStan Hu2016-07-271-7/+15
|
* Cache the commit author in RequestStore to avoid extra lookups in PostReceiveStan Hu2016-07-271-1/+8
| | | | | | | | In a PostReceive task with 697 commits (8.9 RC1 -> RC8), looking up the commit author takes about 10% of the time. Caching this information in RequestStore saves a few seconds from the overall processing time. Improves #18663
* Ensure relative paths for video are rewritten as we do for images20189-markdown-video-doesn-t-work-when-the-referenced-video-file-is-in-same-repoRémy Coutable2016-07-261-2/+2
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-061-0/+7
|
* Optimize Banzai::Filter::RelativeLinkFilterAlejandro Rodríguez2016-06-211-0/+26
| | | | | | | | | | | | A lot of git operations were being repeated, for example, to build a url you would ask if the path was a Tree, which would call a recursive routine in Gitlab::Git::Tree#where, then ask if the path was a Blob, which would call a recursive routine at Gitlab::Git::Blob#find, making reference to the same git objects several times. Now we call Rugged::Tree#path, which allows us to determine the type of the path in one pass. Some other minor improvement added, like saving commonly used references instead of calculating them each time.
* Remove `projects` inclusion in `notes_with_associations` to skip some ↵Alejandro Rodríguez2016-06-081-1/+1
| | | | | | | | | | | | | | unnecessary queries `notes_with_associations` are used for `participant` declarations, but `Participable` only really cares about the target entity project, and not the participants projects. `notes_with_associations` are also used in `Commit::has_been_reverted?` which employs the reference extractor of the commit, so no references to the notes projects are made there (`Mentionable::all_references` cares only about the `author` and other `attr_mentionable`). A paralel situation occurs on `Issue::referenced_merge_requests`.
* Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski2016-06-021-3/+3
|
* Refactor ParticipableYorick Peterse2016-06-011-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are several changes to this module: 1. The use of an explicit stack in Participable#participants 2. Proc behaviour has been changed 3. Batch permissions checking == Explicit Stack Participable#participants no longer uses recursion to process "self" and all child objects, instead it uses an Array and processes objects in breadth-first order. This allows us to for example create a single Gitlab::ReferenceExtractor instance and pass this to any Procs. Re-using a ReferenceExtractor removes the need for running potentially many SQL queries every time a Proc is called on a new object. == Proc Behaviour Changed Previously a Proc in Participable was expected to return an Array of User instances. This has been changed and instead it's now expected that a Proc modifies the Gitlab::ReferenceExtractor passed to it. The return value of the Proc is ignored. == Permissions Checking The method Participable#participants uses Ability.users_that_can_read_project to check if the returned users have access to the project of "self" _without_ running multiple SQL queries for every user.
* Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński2016-04-211-3/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-161-5/+1
| |\ | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * \ Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-131-3/+5
| |\ \
| * | | Use Ci::Commit as PipelineKamil Trzcinski2016-04-111-3/+4
| | | |
* | | | Merge branch '15139-fix-constants-redefinition-warnings' into 'master' Robert Speicher2016-04-191-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define constants only if not defined yet and freeze them Fixes #15139. See merge request !3810
View Lorry Controller Status