17 Jul, 2013
1 commit
-
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
12 Jul, 2013
1 commit
-
Change-Id: Ib71ce8cf993627eada63d7d596fb302ec702f36e
10 Jul, 2013
1 commit
-
Conflicts: CHANGELOG VERSION app/views/admin/teams/projects/new.html.haml app/views/projects/teams/available.html.haml doc/install/installation.md
08 Jul, 2013
1 commit
-
Added ability to add and remove the forked from/to relatioinship between existing repos.
22 Jun, 2013
1 commit
18 Jun, 2013
1 commit
06 Jun, 2013
2 commits
04 Jun, 2013
1 commit
-
Conflicts: Gemfile.lock app/models/ability.rb app/models/project.rb app/views/snippets/_form.html.haml db/schema.rb features/steps/shared/paths.rb spec/factories.rb spec/models/project_spec.rb
27 May, 2013
1 commit
-
…rmer03-feature_teams_api Conflicts: doc/api/README.md
23 May, 2013
2 commits
21 May, 2013
1 commit
-
* Closing #3066 * Closing #3609
14 May, 2013
1 commit
07 May, 2013
3 commits
-
Code cleanup: Replace old hashes and remove trailing spaces
06 May, 2013
1 commit
05 May, 2013
2 commits
02 May, 2013
1 commit
01 May, 2013
1 commit
10 Apr, 2013
1 commit
01 Apr, 2013
1 commit
25 Mar, 2013
1 commit
18 Mar, 2013
1 commit
17 Mar, 2013
1 commit
-
Most of these are comments but a few are strings for users. Might be an idea to run this from time to time: https://github.com/lyda/misspell-check It runs mostly clean now.
11 Mar, 2013
1 commit
07 Mar, 2013
5 commits
-
* updated system hooks documentation and code comments * fixed access to system hooks if no user given resulting in a `500 Server Error` * added tests
-
Fix API return codes
-
Conflicts: doc/api/projects.md spec/requests/api/projects_spec.rb
06 Mar, 2013
3 commits
-
Additional Admin APIs
-
Added methods to manage project deploy keys via API
05 Mar, 2013
2 commits
27 Feb, 2013
2 commits
-
Now the correct attribute is checked if it's available or not. Also fixed a test.
-
Added a helper method to check if required parameters are given in an API call. Can be used to return a `400 Bad Request` return code if a required attribute is missing. Code clean up and fixed tests.