09 Apr, 2014

1 commit

25 Mar, 2014

1 commit

22 Mar, 2014

1 commit

13 Mar, 2014

1 commit

03 Mar, 2014

2 commits

13 Feb, 2014

1 commit

  • 29cfd33d   Add email aliases for users ... Browse Dir » 
    Emails are used to associate commits with users. The emails
are not verified and don't have to be valid email addresses. They
are assigned on a first come, first serve basis.

Notifications are sent when an email is added.
    Jason Hollingsworth
     

23 Jan, 2014

1 commit

22 Jan, 2014

1 commit

11 Jan, 2014

1 commit

10 Dec, 2013

1 commit

25 Nov, 2013

1 commit

20 Nov, 2013

1 commit

12 Nov, 2013

1 commit

07 Nov, 2013

1 commit

05 Nov, 2013

1 commit

04 Nov, 2013

1 commit

  • c46eaca9   More escaping ... Browse Dir » 
    - Database name may contain characters which are not shell friendly
- Database password could contain the same
- While we at it there is no harm in escaping generated paths too
- Refactored 2-line system(command)

Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
    Nigel Kukard
     

17 Oct, 2013

1 commit

16 Oct, 2013

1 commit

07 Sep, 2013

1 commit

  • 01ff084a   Improved large commit handling. ... Browse Dir » 
    Previously, only number of changed files mattered. Now, number of lines to render in the diff are also taken into account.

A hard limit is set, above which diffs are not rendered and users are not allowed to override that. This prevents high server
resource usage with huge commits.

Related to #1745, #2259

In addition, handle large commits for MergeRequests and Compare controllers.

Also fixes a bug where diffs are loaded twice, if user goes directly to merge_requests/:id/diffs URL.
    Boyan Tabakov
     

25 Aug, 2013

1 commit

  • c8a115c0   Link issues from comments and automatically close them ... Browse Dir » 
    Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
references in descriptions, titles, or attached Notes creates a back-reference
Note that links to the original referencer. Furthermore, pushing commits with
commit messages that match a (configurable) regexp to a project's default
branch will close any issues mentioned by GFM in the matched closing phrase.
If accepting a merge request would close any Issues in this way, a banner is
appended to the merge request's main panel to indicate this.
    ash wilson
     

08 Aug, 2013

1 commit

30 Jul, 2013

1 commit

29 Jul, 2013

1 commit

17 Jul, 2013

4 commits

  • d9959427   Style changes from review with @randx ... Browse Dir » 
    -Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow

Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
    Izaak Alpert
     
  • 128f2845   Rebased on 6.0 ... Browse Dir » 
    -Had to do some minor test clean up as well

Change-Id: I8f378f1b5fe676d73b8691e870c11ca6def90cbf
    Izaak Alpert
     
  • 216d5e2c   Fix intermittently failing notification_service test ... Browse Dir » 
    Change-Id: Ic23cb46901f8adc77943bf3cc79566587364e22a
    Izaak Alpert
     
  • 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
    Izaak Alpert
     

26 Jun, 2013

1 commit

22 Jun, 2013

1 commit

14 May, 2013

1 commit

27 Apr, 2013

1 commit

11 Apr, 2013

2 commits

10 Apr, 2013

1 commit

03 Apr, 2013

1 commit

01 Apr, 2013

4 commits