- Oct 09, 2013
-
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
* Render right layout depends on current_user * show sample git username/email when repo is empty * Show extra info when browsing public area * Fixed some tests related to public projects * show comments in read-only for public projects * Remove old public routing
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
* Show new merge request button from compare page * Show message if user selected same branches * Show message if compared branches are the same * Prepend inputs with from/to labels
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
- Aug 26, 2013
-
-
Dmitriy Zaporozhets authored
-
- Aug 20, 2013
-
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Hiroyuki Sato authored
-
- Aug 19, 2013
-
-
Dmitriy Zaporozhets authored
* call set_iid before validation * make rake task pass event if objects are invalid * show iid in comment event at dashboard
-
- Aug 10, 2013
-
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
- Aug 06, 2013
-
-
Dmitriy Zaporozhets authored
-
- Aug 04, 2013
-
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
- Aug 03, 2013
-
-
Robert Schilling authored
-
- Jul 31, 2013
-
-
Dmitriy Zaporozhets authored
-
- Jul 29, 2013
-
-
Johannes Schleifenbaum authored
-
- Jul 27, 2013
-
-
Dmitriy Zaporozhets authored
-
- Jul 26, 2013
-
-
Javier Castro authored
-
- Jul 18, 2013
-
-
Izaak Alpert authored
-removed extranious space from new_merge_request_email.text.erb Change-Id: I65314b3fe8f8442b4c30d311b96fbceddf240f42
-
Izaak Alpert authored
Forked MR's will print Project:Branch <source_project_with_path>:<source_branch> -> <target_project_with_path>:<target_branch> Non forked MR's will print Branch <source_branch> -> <target_branch> Change-Id: I89399aec2e7fde8e4b64b110a48099a95ae4f038
-
Izaak Alpert authored
-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
-
Izaak Alpert authored
-Disable observers post test run -Allow db:seed_fu RAILS_ENV=test to be run more than once without error -fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned -make notes/commits render against proper project -MR discussion file links should reference note's project -Added tests for commit links on edit merge request -fixes edit issues (canceling an edited mr, updating an edited mr) -updates tests with checks for source code updates -still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set) MR API: error on bad target_project -If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target -Fixes some busted (but hidden) test cases Conflicts: app/views/merge_requests/show/_diffs.html.haml spec/features/notes_on_merge_requests_spec.rb Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
-
Izaak Alpert authored
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
-
- Jul 16, 2013
-
-
Dmitriy Zaporozhets authored
-
- Jul 13, 2013
-
-
Dmitriy Zaporozhets authored
-
- Jul 01, 2013
-
-
Jack Weeden authored
-
- Jun 26, 2013
-
-
Gábor Egyed authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Izaak Alpert authored
-Alt text to image was set to hash, which would make the page display hashes if the image/gravatar wasn't available, set the alt text to '', and made the main tool bar image follow the same or similar constraints as the other images (.avatar, .s26) Conflicts: app/assets/stylesheets/themes/ui_bb.scss app/views/snippets/_snippet.html.haml Change-Id: I42e1e86f535486fd2556d4b3e4591f3676eea033
-
- Jun 24, 2013
-
-
Dmitriy Zaporozhets authored
-
Javier Castro authored
-
- Jun 23, 2013
-
-
Dmitriy Zaporozhets authored
-