summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
Commit message (Expand)AuthorAgeFilesLines
* Move update_project_counter_caches? out of issue and merge requestGeorge Andrinopoulos2017-11-111-4/+0
* Fix another timeout when searching for pipelinesSean McGivern2017-11-101-1/+13
* Merge branch 'dm-notes-for-commit-id' into 'master'Rémy Coutable2017-11-081-1/+1
|\
| * Use Commit#notes and Note.for_commit_id when possible to make sure we use all...dm-notes-for-commit-idDouwe Maan2017-11-081-1/+1
* | Refactor issuables index actionsJarka Kadlecova2017-11-071-2/+0
|/
* ignore the column before the migrationmicael.bergeron2017-11-061-1/+2
* removed the #ensure_ref_fetched from all controllersmicael.bergeron2017-11-031-24/+3
* CE port of code changed for epicsjk-epic-changes-ce-portJarka Kadlecova2017-11-021-0/+3
* Merge branch '39054-activerecord-statementinvalid-pg-querycanceled-error-canc...Yorick Peterse2017-10-301-1/+1
|\
| * Avoid hitting statement timeout finding MR pipelines39054-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeoutSean McGivern2017-10-271-1/+1
* | Move locked check to a guard-clauseOswaldo Ferreira2017-10-301-1/+3
* | Make merge_jid handling less stateful in MergeServiceOswaldo Ferreira2017-10-271-1/+3
|/
* Simplify check for running job on Redis39032-improve-merge-ongoing-check-consistencyOswaldo Ferreira2017-10-131-1/+1
* Make "merge ongoing" check more consistentOswaldo Ferreira2017-10-111-1/+1
* Stop using `branch_names.include?` and use `branch_exists?`Andrew Newdigate2017-10-101-2/+2
* Introduce new hook data builders for Issue and MergeRequest34284-add-changes-to-issuable-webhook-dataRémy Coutable2017-10-091-56/+1
* Start adding Gitlab::HookData::IssuableBuilderRémy Coutable2017-10-091-19/+59
* Include the changes in issuable webhook payloadsRémy Coutable2017-10-091-0/+1
* Merge branch 'tc-geo-read-only-idea' into 'master'Douwe Maan2017-10-071-1/+1
|\
| * Create idea of read-only databasetc-geo-read-only-ideaToon Claes2017-10-061-1/+1
* | Allow creating merge requests across forks of a projectBob Van Landuyt2017-10-071-1/+1
|/
* Move `fetch_ref` from MergeRequestDiff#ensure_commit_shas to MergeRequestRémy Coutable2017-10-051-0/+3
* Merge branch 'merge-request-notes-performance' into 'master'Sean McGivern2017-10-041-8/+14
|\
| * Use a UNION ALL for getting merge request notesmerge-request-notes-performanceYorick Peterse2017-10-021-8/+14
* | Merge branch '36876-mr-show-json-controller-perf-improvements' into 'master'Douwe Maan2017-10-041-3/+2
|\ \
| * | Reduce method calls while evaluating Projects::MergeRequestsController#show.json36876-mr-show-json-controller-perf-improvementsOswaldo Ferreira2017-10-041-3/+2
| |/
* | Port semi-linear merge strategy to CE (mostly FE)Eric Eastwood2017-09-291-0/+8
|/
* Fix refreshing of issues/MR count cachesfix-counts-cachingYorick Peterse2017-09-191-2/+0
* Detect n+1 issues involving GitalyAndrew Newdigate2017-09-191-2/+5
* add controller specmicael.bergeron2017-09-061-1/+2
* rework the contributor badgemicael.bergeron2017-09-061-0/+5
* Resolve outdated diff discussions on pushSean McGivern2017-09-061-0/+6
* Merge branch 'git-operation-service-to-git' into 'master'Sean McGivern2017-09-041-8/+1
|\
| * Prepare GitOperationService for move to Gitlab::GitJacob Vosmaer2017-08-311-8/+1
* | Merge branch 'issue_36820' into 'master'Sean McGivern2017-09-011-0/+2
|\ \
| * | Remove closing external issues by reference errorissue_36820Felipe Artur2017-08-311-0/+2
* | | Merge branch 'sidebar-cache-updates' into 'master'Sean McGivern2017-08-311-0/+6
|\ \ \ | |_|/ |/| |
| * | Only update the sidebar count caches when neededsidebar-cache-updatesYorick Peterse2017-08-301-0/+6
| |/
* | Merge remote-tracking branch 'upstream/master' into 36807-gc-unwanted-refs-af...Lin Jen-Shin2017-08-301-6/+16
|\ \ | |/
| * Rename MergeRequest#async_merge to merge_asyncOswaldo Ferreira2017-08-281-1/+1
| * Add changelogOswaldo Ferreira2017-08-281-1/+1
| * Track enqueued and ongoing MRsOswaldo Ferreira2017-08-281-3/+9
| * Remove locked? check when unlocking a merge requestOswaldo Ferreira2017-08-281-1/+1
| * Merge branch '36262_merge_request_reference_in_merge_commit_global' into 'mas...Sean McGivern2017-08-241-2/+1
| |\
| | * [ci skip] changelog entry added for full merge request ref changeshaseeb2017-08-231-1/+0
| | * fix Merge request reference in merge commit is not globalhaseeb2017-08-131-2/+2
| * | Merge branch 'cache-issue-and-mr-counts' into 'master'Douwe Maan2017-08-231-0/+5
| |\ \
| | * | Cache the number of open issues and merge requestsYorick Peterse2017-08-231-0/+5
* | | | Try to make reserved ref names more obviousLin Jen-Shin2017-08-251-1/+1
|/ / /
* | | Remove ignore columnsFelipe Artur2017-08-181-1/+0
|/ /