30 Jul, 2013
1 commit
-
Conflicts: app/views/projects/commit/show.html.haml app/views/projects/compare/show.html.haml app/views/projects/merge_requests/branch_from.js.haml
29 Jul, 2013
1 commit
17 Jul, 2013
4 commits
-
-Made the api method a little more readable -removed some missed extra newline's Change-Id: Ic38baafc813aaeda0a8b283f39916182c8ec37d5
-
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
26 Jun, 2013
1 commit
22 Jun, 2013
2 commits
-
Remove unnecessary projects order on User#show
21 Jun, 2013
1 commit
19 Jun, 2013
1 commit
18 Jun, 2013
5 commits
11 Jun, 2013
1 commit
06 Jun, 2013
1 commit
-
Authorize all teams to admin: fix 500 error on showing team page.
05 Jun, 2013
2 commits
-
500 error was occured in the following steps: 1. user1 creates new team "team1". 2. Assign team1 to project1. 3. Sign in as admin. This admin is not a member of team1. 4. Open project1 team setting page (/project1/team). 5. Click "team1" link in "Assigned teams" area. 6. 500 error. Fixed this issue.
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
-
…itlabhq into dmedvinsky-add-defaults-create-group-team Conflicts: config/gitlab.yml.example
23 May, 2013
1 commit
16 May, 2013
1 commit
-
“Can create groups” and “Can create teams” had hardcoded defaults to `true`. Sometimes it is desirable to prohibit these for newly created users by default.
07 May, 2013
1 commit
-
Code cleanup: Replace old hashes and remove trailing spaces
06 May, 2013
2 commits
05 May, 2013
1 commit
02 May, 2013
1 commit
-
updated fork feature to use gitlab-shell for v5 of gitlab
15 Apr, 2013
2 commits
10 Apr, 2013
3 commits
09 Apr, 2013
1 commit
-
…q into Undev-feature/refactoring_scopes_pr Conflicts: db/schema.rb
04 Apr, 2013
1 commit
03 Apr, 2013
2 commits
01 Apr, 2013
2 commits
-
Also specify separate project factory for project with filled repo