Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/controllers/projects/merge_requests_controller.rb
AgeCommit message (Expand)Author
2016-08-22Revert the revert of Optimistic LockingValery Sizov
2016-08-19Merge branch 'diff-line-comment-vuejs' into 'master' Douwe Maan
2016-08-19Improve performance of MR show pageDouwe Maan
2016-08-19Merge branch '4273-slash-commands' into 'master'Robert Speicher
2016-08-18Merge branch 'master' into diff-line-comment-vuejsConnor Shea
2016-08-18Refactor to mark Changes tab as active on new MR page.Ruben Davila
2016-08-18Fix tabs navigation and do not update URL via pushstateAlfredo Sumaran
2016-08-17Merge branch 'master' into diff-line-comment-vuejsConnor Shea
2016-08-17Merge branch '20808-merge-request-new-diff-view' into 'master' Robert Speicher
2016-08-17Merge branch 'mc-ui'Douwe Maan
2016-08-16Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18681-pipelines...Kamil Trzcinski
2016-08-13Fix autocomplete on commit and issue/MR edit pagesDouwe Maan
2016-08-13Merge branch 'master' into diff-line-comment-vuejsDouwe Maan
2016-08-12Use a regular flash message after resolution is completeDouwe Maan
2016-08-12Prevent “This merge request contains merge conflicts” from being shown af...Douwe Maan
2016-08-12Get conflict resolution to work for MRs from forksDouwe Maan
2016-08-12Show appropriate message when conflicts have already been resolvedDouwe Maan
2016-08-12Verify user is signed in and can actually resolve conflictsDouwe Maan
2016-08-12Rename `can_resolve_conflicts_in_ui?` to `conflicts_can_be_resolved_in_ui?`Douwe Maan
2016-08-12Add more tests for conflictsSean McGivern
2016-08-12Set flash message after conflict is resolvedSean McGivern
2016-08-12Remove undo endpointSean McGivern
2016-08-12Move resolving code to ResolveServiceSean McGivern
2016-08-12Don't allow resolving invalid conflictsSean McGivern
2016-08-12Fix resolve_conflicts endpointSean McGivern
2016-08-12Make SCSS lint and RuboCop happySean McGivern
2016-08-12Render right sidebar and handle request error.Fatih Acet
2016-08-12Handle case where one side deleted the fileSean McGivern
2016-08-12Remove Conflicts tab make it a page instead.Fatih Acet
2016-08-12REMOVE THIS COMMIT: allow undoing last resolutionSean McGivern
2016-08-12Handle conflict resolution errors in controllerSean McGivern
2016-08-12Fix commit tab initial loadSean McGivern
2016-08-12Allow resolving conflicts in MR controllerSean McGivern
2016-08-12Handle multiple merge conflict files in collectionSean McGivern
2016-08-12Add backend for merge conflicts readingSean McGivern
2016-08-12Added routes for conflicts in merge requests page.Fatih Acet
2016-08-12Properly select a list of Pipelines for a Merge RequestsKamil Trzcinski
2016-08-11Pre-create all builds for Pipeline when a trigger is receivedKamil Trzcinski
2016-08-11Fix merge request new view not changing code view rendering stylePaco Guzman
2016-08-04Merge branch 'master' into diff-line-comment-vuejsDouwe Maan
2016-08-03switch from diff_file_collection to diffsPaco Guzman
2016-08-03Introduce Compare model in the codebase.Paco Guzman
2016-08-03Move to Gitlab::Diff::FileCollectionPaco Guzman
2016-08-03Cache highlighted diff lines for merge requestsPaco Guzman
2016-08-02Speedup DiffNote#active? on discussions, preloading noteables and avoid touch...Paco Guzman
2016-08-01State specific default sort order for issuableszs
2016-07-29Merge branch 'master' into diff-line-comment-vuejsDouwe Maan
2016-07-28Reduce number of queries made for merge_requests/:id/diffsAhmad Sherif
2016-07-27Incorporate review commentsStan Hu
2016-07-27Optimize maximum user access level lookup in loading of notesStan Hu
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-18 09:44:37 +0300