22 Jan, 2014

2 commits

14 Jan, 2014

1 commit

13 Jan, 2014

1 commit

09 Jan, 2014

1 commit

08 Jan, 2014

1 commit

06 Jan, 2014

2 commits

03 Jan, 2014

1 commit

01 Jan, 2014

3 commits

31 Dec, 2013

2 commits

30 Dec, 2013

2 commits

24 Dec, 2013

1 commit

20 Dec, 2013

1 commit

19 Dec, 2013

2 commits

14 Dec, 2013

1 commit

12 Dec, 2013

3 commits

12 Nov, 2013

1 commit

  • dfb8d2b7   Improve status message on merge request page ... Browse Dir » 
    The status message currently looks like:

  Created on Oct 24, 2013 by John , currently assigned to Bob

There is a space between the author name and the comma, which is
incorrect.  Also, there is no period at the end of the sentence,
which makes it inconsistent with the following line:

  Merged by Bob 5 minutes ago.

Change it to:

  Created on Oct 24, 2013 by John.  Currently assigned to Bob.

Also change the milestone information from:

  and attached to milestone XYZ

to:

  Attached to milestone XYZ.
    David Pursehouse
     

23 Oct, 2013

1 commit

16 Oct, 2013

1 commit

09 Sep, 2013

1 commit

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
     

19 Aug, 2013

1 commit

15 Aug, 2013

1 commit

12 Aug, 2013

1 commit

08 Aug, 2013

2 commits

01 Aug, 2013

2 commits

30 Jul, 2013

1 commit

17 Jul, 2013

3 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
     
  • 489fa5d7   MR on Fork multiple fixes ... Browse Dir » 
    -Disable observers post test run
-Allow db:seed_fu RAILS_ENV=test to be run more than once without error
-fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned
-make notes/commits render against proper project
-MR discussion file links should reference note's project
-Added tests for commit links on edit merge request
-fixes edit issues (canceling an edited mr, updating an edited mr)
-updates tests with checks for source code updates
-still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set)

MR API: error on bad target_project

-If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target
-Fixes some busted (but hidden) test cases

Conflicts:
	app/views/merge_requests/show/_diffs.html.haml
	spec/features/notes_on_merge_requests_spec.rb

Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
    Izaak Alpert