22 Jan, 2014
1 commit
-
* project_with_code -> project * project -> ermpty_project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
06 Jan, 2014
1 commit
-
Change to username per @PixnBits suggestion
28 Nov, 2013
1 commit
01 Oct, 2013
1 commit
25 Aug, 2013
1 commit
-
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.
21 Aug, 2013
1 commit
17 Jul, 2013
1 commit
-
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
19 Jun, 2013
1 commit
15 Jan, 2013
2 commits
-
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
05 Jan, 2013
2 commits
03 Jan, 2013
1 commit
23 Dec, 2012
1 commit
-
Conflicts: app/assets/stylesheets/main.scss app/models/project.rb app/views/notes/_common_form.html.haml app/views/notes/_per_line_form.html.haml lib/gitlab/markdown.rb spec/models/note_spec.rb
18 Dec, 2012
1 commit
03 Dec, 2012
1 commit
19 Nov, 2012
1 commit
13 Nov, 2012
1 commit
13 Oct, 2012
1 commit
09 Oct, 2012
1 commit
26 Sep, 2012
1 commit
08 Sep, 2012
1 commit
06 Sep, 2012
1 commit
29 Aug, 2012
2 commits
28 Aug, 2012
1 commit
10 Aug, 2012
1 commit
-
Didn't bother with files in db/, config/, or features/
26 Jun, 2012
1 commit
20 Jun, 2012
1 commit
14 Mar, 2012
1 commit
13 Mar, 2012
1 commit
16 Feb, 2012
1 commit
25 Jan, 2012
1 commit
21 Jan, 2012
1 commit
07 Dec, 2011
1 commit
18 Nov, 2011
1 commit
11 Nov, 2011
1 commit
26 Oct, 2011
1 commit
-
* Remove trailing whitespace * Converts hard-tabs into two-space soft-tabs * Remove consecutive blank lines
09 Oct, 2011
1 commit