summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Move #to_discussion to NoteOnDiff21211-comment-on-diff-partially-broken-after-updating-to-8-11Sean McGivern2016-08-303-8/+4
* Fix diff comments on legacy MRsSean McGivern2016-08-301-0/+4
* Merge branch '21275-getting-500-error-when-viewing-a-merge-request'Douwe Maan2016-08-251-2/+6
|\
| * Don't show conflicts when there are noneSean McGivern2016-08-251-1/+5
| * Handle case where conflicts aren't on disk yetSean McGivern2016-08-251-1/+1
* | Merge branch 'statuseable-hasstatus' into 'master' Robert Speicher2016-08-253-3/+3
|\ \
| * | rename Statuseable to HasStatusDe Wet Blomerus2016-08-253-3/+3
| |/
* | Merge branch 'zj-remove-gitorious' into 'master' Douwe Maan2016-08-251-1/+1
|\ \
| * | Remove gitoriouszj-remove-gitoriousZ.J. van de Weg2016-08-251-1/+1
| |/
* | Merge branch 'dz-merge-request-version'Douwe Maan2016-08-252-94/+135
|\ \
| * | Change the way merge request diff compare worksdz-merge-request-versionDmitriy Zaporozhets2016-08-251-18/+6
| * | Add code improvements to merge request version featureDmitriy Zaporozhets2016-08-251-8/+8
| * | Restore diff_sha_refs methodDmitriy Zaporozhets2016-08-222-16/+21
| * | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-2223-73/+181
| |\ \
| * \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1931-51/+506
| |\ \ \
| * | | | Make sure merge request is fetched before collecting base sha in merge reques...Dmitriy Zaporozhets2016-08-191-0/+1
| * | | | Fix and refactor merge request diff_refs methodDmitriy Zaporozhets2016-08-153-21/+4
| * | | | Make merge request diff works with new FileCollection logicDmitriy Zaporozhets2016-08-152-8/+12
| * | | | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1525-172/+406
| |\ \ \ \
| * | | | | Fix merge request diff create and head_commit_sha compatibilityDmitriy Zaporozhets2016-08-151-3/+14
| * | | | | Change the way old merge request diff handledDmitriy Zaporozhets2016-08-152-12/+19
| * | | | | Load merge request versions without loading whole diff from databaseDmitriy Zaporozhets2016-08-091-0/+4
| * | | | | Add MergeRequest#branch_merge_base_commit methodDmitriy Zaporozhets2016-08-081-8/+27
| * | | | | Build diff_refs for merge request if merge request diff does not existDmitriy Zaporozhets2016-08-021-0/+6
| * | | | | Fix creation and reload of the merge request diffDmitriy Zaporozhets2016-08-021-2/+12
| * | | | | Chnage the way how merge request diff is initialized and savedDmitriy Zaporozhets2016-08-022-32/+37
| * | | | | Change merge request diff creation from callback to part of the serviceDmitriy Zaporozhets2016-08-021-5/+0
| * | | | | Add more tests to merge_request_diff and improve initializeDmitriy Zaporozhets2016-08-022-4/+4
| * | | | | Refactor MergeRequestDiff initialize methodDmitriy Zaporozhets2016-08-021-16/+12
| * | | | | Reload merge request association reload when update codeDmitriy Zaporozhets2016-08-021-7/+2
| * | | | | Remove requirement for base_commit_sha to allow creation of merge requests fo...Dmitriy Zaporozhets2016-08-021-3/+2
| * | | | | Add improvements to merge request versionsDmitriy Zaporozhets2016-08-021-1/+3
| * | | | | Ensure merge request is created with valid diff objectDmitriy Zaporozhets2016-08-022-20/+28
| * | | | | Refactor MergeRequestDiff modelDmitriy Zaporozhets2016-08-021-15/+17
| * | | | | Refactor merge request diffDmitriy Zaporozhets2016-08-021-51/+38
| * | | | | Add ability to render different merge request versionsDmitriy Zaporozhets2016-08-021-0/+10
| * | | | | Improve merge request diff creation and update testsDmitriy Zaporozhets2016-08-021-5/+1
| * | | | | Create merge request diff on merge request creationDmitriy Zaporozhets2016-08-021-0/+4
| * | | | | Create new version of merge request diff on push instead of updating existing...Dmitriy Zaporozhets2016-08-021-3/+8
* | | | | | Merge branch '13912-reduce-pipeline-db-queries' into 'master' Yorick Peterse2016-08-253-2/+4
|\ \ \ \ \ \
| * | | | | | Reduce number of database queries on builds tab13912-reduce-pipeline-db-queriesPaco Guzman2016-08-253-2/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Display project icon from default branchHannes Rosenögger2016-08-252-1/+2
|/ / / / /
* | | | | Merge branch 'github-importer' into 'master' Douwe Maan2016-08-241-2/+0
|\ \ \ \ \
| * | | | | Does not halt the GitHub import process when an error occursDouglas Barbosa Alexandre2016-08-241-2/+0
* | | | | | Show "Create Merge Request" widget for push events to fork projects on the so...Paco Guzman2016-08-241-2/+2
|/ / / / /
* | | | | Also check if Akismet is enabled, before showing the `Submit as spam` button.fix-spam-submit-buttonPatricio Cano2016-08-221-1/+1
* | | | | Revert the revert of Optimistic Lockingrevert_revert_issuable_lockValery Sizov2016-08-221-0/+6
| |_|_|/ |/| | |
* | | | Fix Error 500 resulting when loading network graphfix-network-graph-error-500Stan Hu2016-08-201-0/+2
* | | | Make Ability#project_abilities return unique values and fix countsfix-rspec-failures-due-to-cached-permissionsStan Hu2016-08-201-1/+1
* | | | Fix assorted rspec failures due to stale, cached user permissionsStan Hu2016-08-201-21/+27
View Lorry Controller Status