- 20 12月, 2013 1 次提交
-
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- 15 12月, 2013 1 次提交
-
-
由 skv 提交于
-
- 12 12月, 2013 1 次提交
-
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- 13 11月, 2013 1 次提交
-
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- 09 9月, 2013 1 次提交
-
-
由 Dmitriy Zaporozhets 提交于
* added description * simplified form * enabled gfm autocomplete
-
- 09 8月, 2013 1 次提交
-
-
由 Dmitriy Zaporozhets 提交于
-
- 08 8月, 2013 2 次提交
-
-
由 Dmitriy Zaporozhets 提交于
-
由 Dmitriy Zaporozhets 提交于
-
- 18 7月, 2013 7 次提交
-
-
由 Izaak Alpert 提交于
-Messed up part of the merge for _form.html.haml -Probably need discussion about what the new/edit merge page should look like now that it involves projects Change-Id: I77f3a12ab979578fb4420e0fac6e8bf3fd451fe1
-
由 Izaak Alpert 提交于
-Form was for @source_project rather then @project. -add spinach test for edit submission on forked project Change-Id: I807a5077608b7e910f4bc83c5d3e82c378f70a9e
-
由 Izaak Alpert 提交于
-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
-
由 Izaak Alpert 提交于
-Removed many extra spaces I added -Fixed email templates to be consistent/better looking GITLAB-894, GITLAB-895, (GITLAB-858) Change-Id: I35c1a8e0e22af7de26d54e5c3da987fa7bb3921e
-
由 Izaak Alpert 提交于
Wasn't setting fields so validations would fail Change-Id: I0363c57bf6c8b9937cc1b4140d09071d7c5168c2
-
由 Izaak Alpert 提交于
-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 提交于
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
-
- 17 7月, 2013 2 次提交
-
-
由 Dmitriy Zaporozhets 提交于
-
由 Dmitriy Zaporozhets 提交于
-
- 24 6月, 2013 1 次提交
-
-
由 Dmitriy Zaporozhets 提交于
-
- 22 6月, 2013 2 次提交
-
-
由 Dmitriy Zaporozhets 提交于
-
由 Dmitriy Zaporozhets 提交于
-
- 20 4月, 2013 1 次提交
-
-
由 Lucas Uyezu 提交于
-
- 31 3月, 2013 1 次提交
-
-
由 Dmitriy Zaporozhets 提交于
Use existing methods for branch names: Ex use @repository.branch_names instead of @repository.heads.map(&:name)
-
- 30 1月, 2013 2 次提交
-
-
由 Dmitriy Zaporozhets 提交于
-
由 Dmitriy Zaporozhets 提交于
-
- 06 1月, 2013 1 次提交
-
-
由 Dmitriy Zaporozhets 提交于
-
- 05 1月, 2013 2 次提交
-
-
由 Koen Punt 提交于
-
由 Dmitriy Zaporozhets 提交于
-
- 04 1月, 2013 1 次提交
-
-
由 Dmitriy Zaporozhets 提交于
-
- 19 12月, 2012 1 次提交
-
-
由 Dmitriy Zaporozhets 提交于
-
- 26 10月, 2012 1 次提交
-
-
由 Sergio Visinoni 提交于
Step 1: * Add milestone_id in the model for merge_requests * Make it possible to create or update a Merge Request with an attached Milestone detail * Add the possibility to filter by Milestone and / or Assignee in the Merge Requests listing page
-
- 19 10月, 2012 1 次提交
-
-
由 Nihad Abbasov 提交于
-
- 16 10月, 2012 1 次提交
-
-
由 Riyad Preukschas 提交于
Fixes #1525
-
- 10 10月, 2012 1 次提交
-
-
由 Riyad Preukschas 提交于
-
- 10 9月, 2012 1 次提交
-
-
由 Robert Speicher 提交于
Seeing `:javascript` all over Views feels like a code smell. This goes a long way towards reducing the amount of JS in views, but there's still plenty to be done on that front.
-
- 03 9月, 2012 1 次提交
-
-
由 Sytse Sijbrandij 提交于
Merge branch 'master' into non-interactive-aws-install Conflicts: doc/installation.md Fix merge mess in installation.md
-
- 31 8月, 2012 1 次提交
-
-
由 randx 提交于
-
- 30 8月, 2012 1 次提交
-
-
由 randx 提交于
-
- 09 9月, 2012 1 次提交
-
-
由 Robert Speicher 提交于
-
- 11 8月, 2012 1 次提交
-
-
由 Robert Speicher 提交于
Didn't bother with files in db/, config/, or features/
-
- 17 7月, 2012 1 次提交
-
-
由 Dmitriy Zaporozhets 提交于
-