Software Publico / Gitlab

16 Oct, 2013

1 commit

aefe2e95 Fixing unsafe use of Thread.current variable :current_user Browse File »

Angus MacArthur
2013-10-16 01:20:53 -0400

15 Oct, 2013

1 commit

f4d68f39 set current_user for project spec Browse File »

Dmitriy Zaporozhets
2013-10-15 11:29:22 +0300

11 Oct, 2013

1 commit

f40e0171 Test if markdown is rendered properly. Browse File »

Marin Jankovski
2013-10-11 13:44:00 +0200

26 Sep, 2013

1 commit

0a2a34a4 Ignore owner_id for Group in tests Browse File »

Dmitriy Zaporozhets
2013-09-26 14:52:17 +0300

17 Sep, 2013

1 commit

a3ef6831 Drop support of root namespace in model Browse File »

Hiroyuki Sato
2013-09-17 23:05:42 +0900

13 Sep, 2013

1 commit

df9cbbc9 Drop support of root namespace in routing Browse File »

Hiroyuki Sato
2013-09-13 07:00:24 +0900

21 Aug, 2013

1 commit

8dd37afe Reannotate Browse File »

Dmitriy Zaporozhets
2013-08-21 12:34:02 +0300

20 Aug, 2013

1 commit

e9f1c39e Fix tests Browse File »

Dmitriy Zaporozhets
2013-08-20 21:41:14 +0300

13 Aug, 2013

1 commit

7825830c Allow project name, path etc start with number. Fixed specs Browse File »

Dmitriy Zaporozhets
2013-08-13 12:24:10 +0300

30 Jul, 2013

1 commit

0d715bcd Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork ... Browse File »
```
Conflicts:
	app/views/projects/commit/show.html.haml
	app/views/projects/compare/show.html.haml
	app/views/projects/merge_requests/branch_from.js.haml
```
Dmitriy Zaporozhets
2013-07-30 13:35:33 +0300

29 Jul, 2013

1 commit

cd19f82e Fix typos Browse File »

Johannes Schleifenbaum
2013-07-29 12:47:06 +0200

17 Jul, 2013

1 commit

3d7194f0 Merge Request on forked projects ... Browse File »

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

2013-07-17 22:41:30 -0400

19 Jun, 2013

1 commit

6e35acef Annotated Browse File »

Dmitriy Zaporozhets
2013-06-19 15:40:33 +0300

04 Jun, 2013

1 commit

bcc4e4dc Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist ... Browse File »

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

2013-06-04 18:36:22 +0300