summaryrefslogtreecommitdiff
path: root/app/contexts
Commit message (Collapse)AuthorAgeFilesLines
* Move all Context classes into ServicesDmitriy Zaporozhets2014-01-1614-486/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'refactoring/issues_filter' into 'master'Dmitriy Zaporozhets2014-01-163-135/+0
|\ | | | | | | | | | | Refactoring: Issues/MR filtering logic Move all issues, mr filtering logic into FilteringService
| * Remove unnecessary contextsDmitriy Zaporozhets2014-01-153-135/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Remove commit_load_context.rbDmitriy Zaporozhets2014-01-151-34/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Convert TestHookContext into TestHookService. Added testsDmitriy Zaporozhets2014-01-151-7/+0
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add sort dropdown to merge requests listDmitriy Zaporozhets2014-01-141-0/+3
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move issues sort logic to Issuable concernDmitriy Zaporozhets2014-01-141-15/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Better search login for global context. Improved testsDmitriy Zaporozhets2014-01-091-14/+9
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Use new context for searchDmitriy Zaporozhets2014-01-091-42/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Search::GlobalContext and Search::ProjectContext for separation between 2 ↵Dmitriy Zaporozhets2014-01-092-0/+82
| | | | | | types of search Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add sorting to public projects pageDmitriy Zaporozhets2013-12-261-2/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor FilterContextDmitriy Zaporozhets2013-12-251-10/+37
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix 500 error when rename repositoryDmitriy Zaporozhets2013-12-231-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Update repository head successively during project updateDmitriy Zaporozhets2013-12-161-7/+1
| | | | | | | It prevents situation when async worker slowly updates HEAD and we show old branch as repository HEAD in project settings Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix messages typoTakuya Nishigori2013-12-163-5/+5
|
* Add require for Files contextsDmitriy Zaporozhets2013-12-103-0/+6
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fixed some deprecationsJeroen van Baarsen2013-12-101-1/+1
| | | | | | * Model.all is deprecacted, use without .all * confirm: message is deprecated, needed to be wrapped in data block
* Merge branch 'authenticated_public_mode' of ↵Dmitriy Zaporozhets2013-11-273-6/+16
|\ | | | | | | | | | | | | | | | | https://github.com/jhollingsworth/gitlabhq into feature/internal_projects Conflicts: app/models/project.rb Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Adding authenticated public mode (internal).Jason Hollingsworth2013-11-263-6/+16
| | | | | | | | | | | | Added visibility_level icons to project view (rather than just text). Added public projects to search results. Added ability to restrict visibility levels standard users can set.
* | Fix default branch being cached and show old one after changeDmitriy Zaporozhets2013-11-271-1/+3
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Added sorting to project issues pageJason Blanchard2013-11-231-0/+18
|
* Improve consistency: use file_path for API create/update/delete filesDmitriy Zaporozhets2013-11-201-7/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* DeleteFile contextDmitriy Zaporozhets2013-11-191-0/+38
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor Create/Update file context and libDmitriy Zaporozhets2013-11-112-5/+3
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Removed Project#discover_default_branch since it not needed any moreDmitriy Zaporozhets2013-11-081-2/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Project#default_branch use repo HEAD instead of DB value nowDmitriy Zaporozhets2013-11-061-0/+10
| | | | | | | | Drop default_branch field from projects table Use repository.root_ref as value for defautl_branch method Fixes issue with default_branch and HEAD getting out of sync Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactoring for EditTree and NewTree controllers and contextsDmitriy Zaporozhets2013-11-051-0/+38
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move part of file creation logic into separate contextDmitriy Zaporozhets2013-11-053-1/+81
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #5435 from ↵Dmitriy Zaporozhets2013-10-311-4/+6
|\ | | | | | | | | karlhungus/feature_search_namespace_name_and_public Allow searching by namespace name, include public projects
| * Allow searching by namespace name, include public projectsIzaak Alpert2013-10-241-4/+6
| | | | | | | | | | | | GITLAB-1457 (GITLAB-836) Change-Id: If8e2474bc6908accca51f395f58937687f101b58
* | Correctly escape search queryDmitriy Zaporozhets2013-10-311-1/+2
| |
* | Shell escape code searchDmitriy Zaporozhets2013-10-311-1/+1
|/
* Show branches list (which branches contains commit) on commit pageAndrey Kumanyaev2013-10-211-0/+1
|
* Added search for projects by name to apiIzaak Alpert2013-09-231-1/+1
| | | | | | | | | GITLAB-1283 (GITLAB-869) Change-Id: I611e7e93f6292de08e1edc8d3ea77cf9087b6ded Conflicts: config/initializers/1_settings.rb
* Fix default settings when creating new ProjectJoerg Bornschein2013-09-131-1/+1
|
* make public/private setting for project creation configurableAngus MacArthur2013-09-091-1/+2
|
* Improved large commit handling.Boyan Tabakov2013-09-071-1/+2
| | | | | | | | | | | | | Previously, only number of changed files mattered. Now, number of lines to render in the diff are also taken into account. A hard limit is set, above which diffs are not rendered and users are not allowed to override that. This prevents high server resource usage with huge commits. Related to #1745, #2259 In addition, handle large commits for MergeRequests and Compare controllers. Also fixes a bug where diffs are loaded twice, if user goes directly to merge_requests/:id/diffs URL.
* Search: show recent issues/mr firstDmitriy Zaporozhets2013-08-151-2/+2
|
* Allow project path being passed on project creationDmitriy Zaporozhets2013-08-141-1/+1
|
* Validate project limit only when create projectDmitriy Zaporozhets2013-08-131-3/+6
|
* Repository import during project creation often return timeout for medium ↵Dmitriy Zaporozhets2013-08-121-14/+0
| | | | | | | and large repos. So lets do it async. First create project, then import repo and create satellite with Sidekiq
* Rewrite issues/mr filtering logicDmitriy Zaporozhets2013-08-102-13/+21
|
* Fix filter context. Dont duplicate target project name for MRDmitriy Zaporozhets2013-08-081-1/+1
|
* Merge branch 'master' into karlhungus-mr-on-forkDmitriy Zaporozhets2013-08-083-6/+6
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: app/contexts/filter_context.rb app/contexts/search_context.rb app/models/merge_request.rb app/models/note.rb app/views/shared/_merge_requests.html.haml spec/controllers/commit_controller_spec.rb spec/services/notification_service_spec.rb
| * Better filter var for MR. show reset filter only if makes senseDmitriy Zaporozhets2013-08-071-1/+1
| |
| * Increase amount of search results for issues, mr, projectsDmitriy Zaporozhets2013-08-071-3/+3
| |
| * Dashboard/Group issues and mr pages refactoringDmitriy Zaporozhets2013-08-061-1/+1
| |
* | Style changes from review with @randxIzaak Alpert2013-07-171-6/+6
| | | | | | | | | | | | -Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
* | Merge Request on forked projectsIzaak Alpert2013-07-173-9/+9
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
* Discover default branch on project creationgDmitriy Zaporozhets2013-07-041-2/+7
|
View Lorry Controller Status