17 Mar, 2014
1 commit
23 Feb, 2014
1 commit
-
Fixes #6046
11 Feb, 2014
1 commit
29 Jan, 2014
1 commit
27 Jan, 2014
2 commits
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
24 Jan, 2014
1 commit
-
Conflicts: spec/models/project_spec.rb
23 Jan, 2014
1 commit
22 Jan, 2014
1 commit
-
* project_with_code -> project * project -> ermpty_project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
15 Dec, 2013
1 commit
10 Dec, 2013
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
25 Nov, 2013
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
09 Oct, 2013
1 commit
26 Aug, 2013
1 commit
20 Aug, 2013
1 commit
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
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
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
19 May, 2013
1 commit
01 Apr, 2013
3 commits
-
Also specify separate project factory for project with filled repo
31 Mar, 2013
1 commit
25 Mar, 2013
1 commit
20 Mar, 2013
1 commit
13 Mar, 2013
1 commit
-
This commit enables the usage of the Gitlab Markdown post processing on all Markdown formatted files. For file types that do not contain Markdown, it defaults to the Gollum native renderer to process the content.
28 Feb, 2013
1 commit
17 Jan, 2013
1 commit
16 Jan, 2013
3 commits
-
Fixes #2166
-
Fixes #2617
04 Jan, 2013
1 commit
22 Dec, 2012
2 commits
07 Dec, 2012
1 commit
28 Nov, 2012
1 commit
02 Oct, 2012
1 commit
19 Sep, 2012
1 commit
13 Sep, 2012
1 commit
-
Also fixes the spec so that it actually tests the thing it says it's testing. Hooray! Closes #1308