Commit graph

35 commits

Author SHA1 Message Date
ash wilson
c8a115c0e3 Link issues from comments and automatically close them
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.
2013-08-25 18:58:41 -04:00
Dmitriy Zaporozhets
8dd37afe34 Reannotate 2013-08-21 12:34:02 +03:00
Izaak Alpert
3d7194f011 Merge Request on forked projects
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 -04:00
Dmitriy Zaporozhets
6e35aceff2 Annotated 2013-06-19 15:40:33 +03:00
Dmitriy Zaporozhets
b059de2ac7 Fix notes model specs 2013-01-15 15:19:14 +02:00
Riyad Preukschas
3022786948 Merge commit 'master' into discussions
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
2013-01-15 00:52:25 +01:00
Dmitriy Zaporozhets
5a214ee6f1 Remove unused methods 2013-01-05 13:11:15 +02:00
Dmitriy Zaporozhets
9a88e4d184 Fix some tests. Use travis-ci 1.9.2 2013-01-05 00:43:32 +02:00
Dmitriy Zaporozhets
39ba934c0a REpostiry, Team models 2013-01-03 21:09:18 +02:00
Riyad Preukschas
db2c15369c Merge branch 'master' into discussions
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
2012-12-23 01:03:57 +01:00
Dmitriy Zaporozhets
9ada678819 Split commit_id and noteable_id for Note 2012-12-18 20:02:00 +02:00
Riyad Preukschas
ae067ee322 Fix vote counting 2012-12-03 22:51:56 +01:00
Dmitriy Zaporozhets
95c23b2f97 Annotated. schema updated 2012-11-19 21:24:05 +03:00
Vincent Bonmalais
80fb38de7a Remove backward compatibility of factories. 2012-11-13 22:27:45 +11:00
Riyad Preukschas
b1461de993 Make Note methods saner 2012-10-13 16:23:12 +02:00
Dmitriy Zaporozhets
41e53eb980 Annotated 2012-10-09 11:14:17 +03:00
Nihad Abbasov
83efcabc82 set activerecord whitelist_attributes to true 2012-09-26 11:18:35 -07:00
Riyad Preukschas
06c1a8a9ae Make notes recognize downvotes 2012-09-08 16:05:48 +02:00
Robert Speicher
2faa4bba40 Update Note#upvote? to support emoji voting 2012-09-06 15:31:25 -04:00
Robert Speicher
97423a0bed Add more coverage for model validations and associations 2012-08-29 11:36:02 -04:00
Robert Speicher
9e7d77cece Remove annotations from specs 2012-08-29 10:44:34 -04:00
Robert Speicher
77d06454ed Simple model spec changes made possible by new factories 2012-08-28 21:22:49 -04:00
Robert Speicher
7754189187 Fully embrace Ruby 1.9 hash syntax
Didn't bother with files in db/, config/, or features/
2012-08-10 18:25:15 -04:00
randx
6abc649590 Reannotated 2012-06-26 21:23:09 +03:00
Robb Kidd
02924de3e1 Add method to Note to create notes about status changes. 2012-06-20 14:09:46 -04:00
Ariejan de Vroom
8d8b82127f Count +1 votes in issue notes. 2012-03-14 15:31:31 +02:00
Dmitriy Zaporozhets
3676838dc9 Rspec test repo replaced.\nMerge Requests improved 2012-03-13 23:54:49 +02:00
Dmitriy Zaporozhets
1c62ec09b0 4 roles permission system 2012-02-16 09:03:55 +02:00
Dmitriy Zaporozhets
b4cc04d7e1 Commit diff fixes, per-line comments fixed 2012-01-25 21:10:09 +02:00
Dmitriy Zaporozhets
f4e3ec29c4 fixed commit commenting 2012-01-21 14:54:32 +02:00
Dmitriy Zaporozhets
1b8f082061 new access rights implemented 2011-12-07 10:04:57 +02:00
Drew
91d5a906f9 Resolved issue #235 2011-11-18 01:52:13 -05:00
Dmitriy Zaporozhets
4ecf17cf9a annotated 2011-11-11 00:08:20 +02:00
Nihad Abbasov
d62200cad4 clean-up code
* Remove trailing whitespace
  * Converts hard-tabs into two-space soft-tabs
  * Remove consecutive blank lines
2011-10-26 18:46:25 +05:00
gitlabhq
9ba1224867 init commit 2011-10-09 00:36:38 +03:00