12 Nov, 2013

1 commit

09 Oct, 2013

1 commit

30 Jul, 2013

1 commit

29 Jul, 2013

1 commit

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
    Izaak Alpert
     

16 Jul, 2013

2 commits

12 Jul, 2013

1 commit

24 Jun, 2013

1 commit

11 Jun, 2013

1 commit

04 Jun, 2013

1 commit

30 May, 2013

1 commit

06 May, 2013

1 commit

02 May, 2013

1 commit

  • 4c44c5ef   Internally public projects ... Browse File » 
    Public projects listed in the public section will be linked to the
actual project's page. Public projects now give any user Guest
permissions to the project, allowing them to download the code, read
and create issues, and view anything else in the project's pages.

Ample access tests have been added to the project_access_spec to
verify correct permissions and behavior on public projects.
- Visitors to the site who are not logged in still cannot view the
  project's pages.
- Logged-in users visiting a public project where they are not a team
  member can create issues, but not snippets. They can view the projects
  code, issues, merge requests, etc, just as if they were a Guest member
  of the project.
- Since this is a public project, the user is also granted :download_code
  permissions, a permission normally reserved for Reporters, since they
  can clone the repo anyways and browse commits and branches locally.
    Stephen Lottermoser
     

03 Apr, 2013

1 commit

25 Mar, 2013

1 commit

24 Mar, 2013

1 commit

19 Mar, 2013

2 commits

15 Mar, 2013

1 commit

14 Mar, 2013

1 commit

10 Mar, 2013

1 commit

  • 1479f172   Add Spinach coverage for Gollum Wiki system and correct the Delete link. ... Browse File » 
    The previously failing Spinach steps have been fixed with this commit.
I have also added new steps that cover the entire usage of the Wiki
system.

The new Spinach steps revealed a minor bug in the Delete page process.
The path for the "Delete this page" button was previously set to
`project_wikis_page(@project, @wiki)` when it should have been
using the singular `project_wiki_page(@project, @wiki)` path helper.

The link has been corrected and all steps are now passing.
    Dan Knox
     

07 Mar, 2013

1 commit

01 Mar, 2013

1 commit

25 Feb, 2013

1 commit

01 Feb, 2013

1 commit

31 Jan, 2013

1 commit

27 Jan, 2013

2 commits

24 Jan, 2013

1 commit

15 Jan, 2013

1 commit

  • 30227869   Merge commit 'master' into discussions ... Browse File » 
    Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb
    Riyad Preukschas
     

09 Jan, 2013

1 commit

04 Jan, 2013

1 commit

26 Dec, 2012

1 commit

03 Dec, 2012

1 commit

02 Dec, 2012

1 commit

10 Nov, 2012

1 commit

04 Nov, 2012

1 commit

01 Nov, 2012

1 commit

31 Oct, 2012

1 commit