Software Publico / Gitlab

11 Sep, 2013

1 commit

73446fe1 Email templates when user was added to group Browse Dir »

Dmitriy Zaporozhets
2013-09-11 21:17:28 +0300

29 Aug, 2013

1 commit

850b4af0 have email views use iid Browse Dir »

James Newton
2013-08-29 21:26:32 -0500

20 Aug, 2013

1 commit

7a26a4b6 Refactor access roles methods Browse Dir »

Dmitriy Zaporozhets
2013-08-20 15:59:45 +0300

08 Aug, 2013

1 commit

4537623d Merge branch 'master' into karlhungus-mr-on-fork ... Browse Dir »

Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb

2013-08-08 12:22:09 +0300

04 Aug, 2013

2 commits

171ce67a Update new_user_email.text.erb ... Browse Dir »
```
Fixed template to include the word 'the'.
```
Jesse Read
2013-08-04 18:04:47 -0400
ad6208c5 Update new_user_email.html.haml ... Browse Dir »
```
Fixed template to include the word 'the'.
```
Jesse Read
2013-08-04 18:04:20 -0400

17 Jul, 2013

4 commits

532809a1 Revert note.project references back to @project ... Browse Dir »
```
-removed extranious space from new_merge_request_email.text.erb

Change-Id: I65314b3fe8f8442b4c30d311b96fbceddf240f42
```
Izaak Alpert
2013-07-17 22:48:03 -0400

539c70c7 Update emails to describe path using for_fork? ... Browse Dir »

Forked MR's will print

Project:Branch <source_project_with_path>:<source_branch> -> <target_project_with_path>:<target_branch>

Non forked MR's will print

Branch <source_branch> -> <target_branch>

Change-Id: I89399aec2e7fde8e4b64b110a48099a95ae4f038

2013-07-17 22:48:03 -0400

0ef055a4 MR on fork: Email fixes, style fixes ... Browse Dir »

-Removed many extra spaces I added
-Fixed email templates to be consistent/better looking

GITLAB-894, GITLAB-895, (GITLAB-858)

Change-Id: I35c1a8e0e22af7de26d54e5c3da987fa7bb3921e

2013-07-17 22:46:38 -0400

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

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

01 Jul, 2013

1 commit

f49fb5dc Fix error when reassign issue/merge_request from non-assigned. Fixes #3201 Browse Dir »

Dmitriy Zaporozhets
2013-07-01 19:01:19 +0300

24 Jun, 2013

1 commit

15f62fcc Fix profile emails with new key route Browse Dir »

Dmitriy Zaporozhets
2013-06-24 19:24:27 +0300

13 Jun, 2013

1 commit

6838304a Force user password change for users created by admin Browse Dir »

Dmitriy Zaporozhets
2013-06-13 21:06:27 +0300

29 May, 2013

1 commit

67a3dc4e Correct spelling error. Browse Dir »

Sytse Sijbrandij
2013-05-29 09:41:17 +0200

28 May, 2013

1 commit

07aa6e59 Warn users to change password after account was created Browse Dir »

Dmitriy Zaporozhets
2013-05-28 17:37:23 +0300

16 May, 2013

1 commit

ef1886d7 A little change on wording for new-user email ... Browse Dir »

adds missing wording missed in https://github.com/gitlabhq/gitlabhq/commit/58d6176bc35fb45427df75b9762df6bb0d3b3a98 and https://github.com/gitlabhq/gitlabhq/pull/3902