Commit Graph
97 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets bcfcd243a6 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-30 20:06:23 +03:00
Sytse Sijbrandij 2f962a40e8 Merge pull request #7170 from cirosantilli/add-trailing-newlines
[minor-refactor] Add trailing newline to all text files.
2014-06-30 09:41:06 +02:00
Dmitriy Zaporozhets 9231b91a40 Fix mentionable spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-27 00:37:04 +03:00
Ciro Santilli a7e0ca9e83 Add trailing newline to all text files.
Present in the large majority of files of each respective type.
2014-06-21 11:20:22 +02:00
Dmitriy Zaporozhets 2d87556847 Remove rails observers from application 2014-06-17 22:51:43 +03:00
Jeroen van Baarsen 2838a993da DB cleaner reverted to a known working version
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-06-07 10:09:56 +02:00
Jeroen van Baarsen 0faf80aa9d Temp fix for rspec so the specs are run again
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-06-06 08:25:02 +02:00
Dmitriy Zaporozhets 67ba36ebac Revert "Revert "Fix for failing specs""
This reverts commit 2545b0f858.
2014-06-06 09:01:17 +03:00
Jeroen van Baarsen 2545b0f858 Revert "Fix for failing specs"
This reverts commit 2314438925.

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Conflicts:
	Gemfile.lock
2014-06-05 20:21:28 +02:00
Jeroen van Baarsen 2314438925 Fix for failing specs 2014-05-30 23:19:50 +02:00
Dmitriy Zaporozhets 1bd28994cc Use ProjectWiki instead of GollumWiki in code
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-09 14:35:58 +03:00
Dmitriy Zaporozhets 535339a6ab Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-25 16:25:59 +02:00
Robert Speicher 760f827ba0 Remove code that does nothing
ping @karlhungus
2014-03-22 15:40:42 -04:00
Robert Speicher 0983438037 TestEnv.reset_satellite_dir should run 'git clean' quietly
Removes the "Removing gitlabhq" messages cluttering spec output
2014-03-13 17:25:55 -04:00
Jacob Vosmaer d6b0ac96f7 Invoke Kernel#system with separate arguments 2014-03-03 08:40:30 +01:00
Jacob Vosmaer b30b9c9c46 Replace shell commands with FileUtils 2014-03-03 08:40:30 +01:00
Jason Hollingsworth 29cfd33d94 Add email aliases for users
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.
2014-02-13 22:59:39 -06:00
Dmitriy Zaporozhets 380342784d Fix MR spinach tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-23 12:55:43 +02:00
Dmitriy Zaporozhets c227aa44f9 Make changes to tests
* project_with_code -> project
* project -> ermpty_project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-22 21:03:52 +02:00
Dmitriy Zaporozhets 047a76009a Remove chosen from tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-11 15:35:39 +02:00
Dmitriy Zaporozhets 77febe8f1e Fixed mistake and mock warning
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:28 +02:00
Dmitriy Zaporozhets 58601ebdab Fix tests after user password length was changed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 20:07:55 +02:00
Dmitriy Zaporozhets fd6e51612e Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-20 19:27:49 +02:00
Marin Jankovski 4e9284a023 Clear state in test satellite dir. 2013-11-12 15:11:46 +01:00
Dmitriy Zaporozhets e8bb32e623 Specs for Create file API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-07 18:53:35 +02:00
Dmitriy Zaporozhets f9b66aecdd Revert "More escaping"
This reverts commit c46eaca912.
2013-11-05 15:35:49 +02:00
Nigel Kukard c46eaca912 More escaping
- 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>
2013-11-04 22:09:03 +00:00
Dmitriy Zaporozhets 7b70d81c83 Speed up tests 2013-10-17 10:52:38 +03:00
Angus MacArthur aefe2e952f Fixing unsafe use of Thread.current variable :current_user 2013-10-16 01:20:53 -04:00
Boyan Tabakov 01ff084a4d Improved large commit handling.
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.
2013-09-07 14:44:03 +03:00
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 ca52f84841 Update chosen, improve ui, fix MR fork tests 2013-08-08 15:14:59 +03:00
Dmitriy Zaporozhets 0d715bcd81 Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork
Conflicts:
	app/views/projects/commit/show.html.haml
	app/views/projects/compare/show.html.haml
	app/views/projects/merge_requests/branch_from.js.haml
2013-07-30 13:35:33 +03:00
Johannes Schleifenbaum cd19f82e51 Fix typos 2013-07-29 12:47:06 +02:00
Izaak Alpert d99594273d Style changes from review with @randx
-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow

Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
2013-07-17 22:48:03 -04:00
Izaak Alpert 128f284577 Rebased on 6.0
-Had to do some minor test clean up as well

Change-Id: I8f378f1b5fe676d73b8691e870c11ca6def90cbf
2013-07-17 22:46:38 -04:00
Izaak Alpert 216d5e2c1a Fix intermittently failing notification_service test
Change-Id: Ic23cb46901f8adc77943bf3cc79566587364e22a
2013-07-17 22:42:51 -04:00
Izaak AlpertandIzaak 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 01cf474fa1 Fix spinach test 2013-06-26 19:13:29 +03:00
Dmitriy Zaporozhets e45179c9b4 remove useless routing tests. Added symlink creation for project with code 2013-06-22 18:57:34 +03:00
Dmitriy Zaporozhets 634cbd7138 Refactor API classes. So api classes like Gitlab::Issues become API::Issues 2013-05-14 15:33:31 +03:00
Dmitriy Zaporozhets 4f2d2c90f7 Move Gitlab::Git out of gitlab core 2013-04-27 23:50:17 +03:00
Dmitriy Zaporozhets ef2c8593b9 Disable mailer for spinach 2013-04-11 23:54:20 +03:00
Dmitriy Zaporozhets 6dcbd646dd disable mailer for Spinach 2013-04-11 11:50:58 +03:00
Dmitriy Zaporozhets 001f3bc59e Specs refactoring to reduce test time. Disabled observers by default for specs 2013-04-10 23:28:42 +03:00
Dmitriy Zaporozhets 413a310faa fixed blame and mr factory 2013-04-03 10:06:31 +03:00
Dmitriy Zaporozhets 3b88636d3c fix tests 2013-04-01 18:35:29 +03:00
Dmitriy Zaporozhets 9a26e9a0d6 Dont init repo on every create(:repo) 2013-04-01 17:27:44 +03:00
Dmitriy Zaporozhets 49b024f5f5 Use Gitlab::Git:: for git features across application 2013-04-01 16:04:35 +03:00
Dmitriy Zaporozhets 22817398e6 define TestEnv and keep all global stubs in one place 2013-04-01 14:39:19 +03:00