Commit Graph
1798 Commits
Author SHA1 Message Date
Jacob Vosmaer 1118a6fd34 Add a spec for User#requires_ldap_check? 2014-08-06 18:03:01 +02:00
Dmitriy Zaporozhets 349eaaa9c2 Fix gfm specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-06 12:15:05 +03:00
Dmitriy Zaporozhets e4c6dbe35f Fix api files specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-06 09:57:15 +03:00
Dmitriy Zaporozhets 8f1e60b057 Fix satellite tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-06 09:52:56 +03:00
Dmitriy Zaporozhets b954f24420 Fix MR controller tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-06 09:07:11 +03:00
Dmitriy Zaporozhets 4710a76a8d Fix commit specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-01 18:06:28 +03:00
Dmitriy Zaporozhets 9338ed0606 Fix project and notes specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-01 17:54:44 +03:00
Dmitriy Zaporozhets 7e1680934b Fix API branch specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-01 17:30:28 +03:00
Dmitriy Zaporozhets 72053703e8 Fix API repository specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-01 15:41:02 +03:00
Dmitriy Zaporozhets 0082cfb146 Fix notify specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-01 15:18:17 +03:00
Dmitriy Zaporozhets ff5176d45a Fix git_push service specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-01 15:11:27 +03:00
Dmitriy Zaporozhets 394ac378f8 Fix markdown tests. Use new repo for testing. Fixed gitlab-shell test setup
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31 23:05:30 +03:00
Dmitriy Zaporozhets 7783f5ec73 Improve copy test repo cmd
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31 21:30:35 +03:00
Dmitriy Zaporozhets a35a22ae05 Remove test dir only if exists
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31 21:01:42 +03:00
Dmitriy Zaporozhets cbe4891d7c Fix form mr tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31 20:13:27 +03:00
Dmitriy Zaporozhets 49b119fa31 Remove old test seeds
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31 19:38:26 +03:00
Dmitriy Zaporozhets 61f70334ef Cleanup test dir before install gitlab-shell. Fix fork test scenario
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31 19:35:07 +03:00
Dmitriy Zaporozhets b238b1544c Recreate tmp/tests on each test run 2014-07-31 19:24:53 +03:00
Dmitriy Zaporozhets ee4643c732 Fix MR tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31 19:19:40 +03:00
Dmitriy Zaporozhets 5a68c20fba Fix MR factory and some MR tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31 18:07:24 +03:00
Dmitriy Zaporozhets c2c7d14ec5 Move all test repos data to ReposHelpers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31 17:23:40 +03:00
Dmitriy Zaporozhets bb2f4d665e Fix browse code spinach tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31 16:20:47 +03:00
Dmitriy Zaporozhets f82b9e48ec Dont stub gitlab-shell calls. Make test environment closer to real one 2014-07-31 15:39:01 +03:00
Dmitriy Zaporozhets d9d8d3b799 Fix old api compatibility and tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-30 17:17:29 +03:00
Dmitriy Zaporozhets 70f868b737 Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-30 16:05:43 +03:00
Dmitriy Zaporozhets 03654a6abf Label and LabelLink models for implementing own GitLab labels
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-29 17:10:15 +03:00
Robert Schilling ceabda743a Improve markup gems 2014-07-28 11:47:27 +02:00
Pierre de La Morinerie 32a6f41f1c Include "Merge-request reopened" emails in the proper email thread 2014-07-25 10:50:58 +02:00
Dmitriy Zaporozhets c23e1f3d41 Fix test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-24 12:48:47 +03:00
Dmitriy Zaporozhets e21ca9f8b1 Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosantilli-star
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-07-24 10:54:42 +03:00
Dmitriy Zaporozhets 4a1e98e4b6 Merge pull request #6650 from lloeki/wiki_images_attachments
Added ability to serve files in wiki repository
2014-07-23 20:28:03 +03:00
Dmitriy Zaporozhets c29857ac00 Merge branch 'new_user_password_set' into 'master'
Admin created user should get password reset link instead of mailed temporary password

Fixes #1405

See merge request !973
2014-07-23 16:44:07 +00:00
Ayrton Araújo 07537faca7 Add support to set satellites timeout 2014-07-21 11:50:29 -04:00
Ciro Santilli e1d307bf4b Move destroy user feature to spec. 2014-07-17 23:22:40 +02:00
Ciro Santilli 9b5c7a4d60 Add star count, view logic, more tests. 2014-07-17 22:47:16 +02:00
Ciro Santilli c589029667 Fix failing spec. 2014-07-17 22:47:16 +02:00
Ciro Santilli 714f7201d3 Add project stars. 2014-07-17 22:47:16 +02:00
Marin Jankovski 8968f6d874 Update specs. 2014-07-16 09:51:20 +02:00
Dmitriy Zaporozhets 22995fc932 Merge branch 'redirect_betwee_tree_and_blob' into 'master'
Redirect between tree and blob

This checks if on requested non-existing tree path blob exists, redirects to blob path if the file exists, otherwise return not found.

See #1369

See merge request !953
2014-07-09 06:19:18 +00:00
Marin Jankovski e87f238077 Add tests for redirects. 2014-07-08 20:25:25 +02:00
Dmitriy Zaporozhets 6a0cb25096 Dont allow ? in project path
Because it causes 500 error on every page where link to such project
exists

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-08 18:15:23 +03:00
Dmitriy Zaporozhets 664112b47e Merge branch 'improve-email-threading' into 'master'
Improve email threading

This is a follow-up to !112 : it improves email threading, without changing the receiver of the emails.

* Subject of answers to an existing thread begins with `Re: ` (required by Mail.app)
* Send a 'In-Reply-To' header along the 'References' header
2014-07-07 14:06:40 +00:00
Pierre de La Morinerie 6dafbf2412 Allow more mail clients to group emails by thread
* send a 'In-Reply-To' header along the 'References' header
* subject of answers to an existing thread begins with 'Re: '
2014-07-03 16:58:42 +02:00
Marin Jankovski 16068f3bfe Test if reopen notifications are sent. 2014-07-03 14:05:07 +02:00
Dmitriy Zaporozhets 8031be73fe Merge branch 'contributors-api' into 'master'
Contributors api

Fixes #1266

See merge request !934
2014-07-03 07:28:02 +00:00
Dmitriy Zaporozhets 5a88873e5c Move API contributors logic to repository model 2014-07-02 14:43:23 +03:00
Marin Jankovski 8a365f5d56 Fix tests because previous assignee didn't exist. 2014-07-02 13:32:53 +02:00
Dmitriy Zaporozhets 81d41c0f92 Collect contributors info via API 2014-07-02 12:40:20 +03:00
Dmitriy Zaporozhets 8fb76a8308 Merge branch 'group_milestones' into 'master'
Group milestones
2014-07-01 07:18:15 +00:00
Dmitriy Zaporozhets bcfcd243a6 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-30 20:06:23 +03:00