Commit Graph
361 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 13f017f01b Fix user model specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-30 14:22:09 +03:00
Dmitriy Zaporozhets 0f550aa386 Remove mass assgnment specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-26 23:57:55 +03:00
Dmitriy Zaporozhets d12b910d20 Merge branch 'remove-observers' into 'master'
Remove observers from application

Part of #1133
2014-06-23 06:36:08 +00:00
Dmitriy Zaporozhets 0771109bb8 Fix permission issue with highest access level for group
If user was a member of both group and project and group access level
was higher it was not respected and user got lowest project access
level. Now it is fixed and user get highest access level

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-20 12:54:03 +03:00
Dmitriy Zaporozhets 73f91da8b1 Fix project deletion and tests 2014-06-17 23:49:17 +03:00
Dmitriy Zaporozhets 2d87556847 Remove rails observers from application 2014-06-17 22:51:43 +03:00
Dmitriy Zaporozhets 9e3094b232 Remove UsersGroup observer 2014-06-17 21:36:40 +03:00
Jacob Vosmaer 3f1ece2690 Detect closing issues in Merge Request description 2014-06-13 17:25:44 +02:00
Marin Jankovski f43e41973f Test for the apostrophe in the email 2014-06-11 13:36:30 +02:00
Jeroen van Baarsen a705d194fa Fixed the project team specs
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-06-08 23:36:09 +02:00
Dmitriy Zaporozhets c283fba3b7 Improve performance of application for large teams
This commit fixes a lot of sql queries to db for for groups and projects
with big amount of members.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-04 11:52:17 +03:00
Marin Jankovski 209726917b Fix the system_hook test. 2014-06-03 11:37:23 +02:00
Dmitriy Zaporozhets cea0fc1de8 Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-28 19:33:49 +03:00
Dmitriy Zaporozhets 8a3807c838 Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-28 12:40:22 +03:00
Dmitriy Zaporozhets 352bb97266 Merge pull request #6731 from hiroponz/better-title-format-for-wiki-page
Better title format for wiki page
2014-04-13 20:13:02 +03:00
Jeroen van Baarsen 25eadf0c5b Proposal for split testing 2014-04-11 13:37:33 +02:00
Dmitriy Zaporozhets 89ecb19126 Merge branch 'ensure_default_fields' into 'master'
Add values to default fields to prevent 500 error when migrate from MySQL to Postgres
2014-04-10 07:20:45 +00:00
Hiroyuki Sato bca528a57c Better title format for wiki page
The title format for wiki page may be unintelligible.
For example 'GitLab' is converted to 'Git Lab', 'MySQL' is converted to
'My Sql', etc.
2014-04-10 15:14:02 +09:00
Dmitriy Zaporozhets 36f861f1b1 Re-annotate models
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-09 15:05:03 +03: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 684877acc4 Fix test broken by 89c942908c
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-08 15:58:28 +03:00
Federico Ravasio 6a9eb4b231 Improved Slack integration with message attachments. 2014-04-06 11:57:48 +02:00
Dmitriy Zaporozhets c31b703110 Fix tests that dont respect project-fork relation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-03 11:47:56 +03:00
Dmitriy Zaporozhets 6ae2529041 Remove KeysObserver
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 21:13:05 +03:00
Marin Jankovski 466203eb0c Additional check in the test. 2014-03-26 12:56:25 +01:00
Marin Jankovski 961d87937b Add the tests for user search. 2014-03-26 12:44:00 +01:00
Dmitriy Zaporozhets cce80d04fe Remove author_id_of_changes from spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-25 14:02:55 +02:00
Federico Ravasio e3fc01b3ea Added Slack service integration. 2014-03-18 18:54:30 +01:00
Jeroen van Baarsen 9a676ccc0a Added tag_push_events to the web_hooks
* Added a scope to the web_hooks model
* Added extra checkbooks in de hooks overview window
2014-03-05 20:44:01 +01:00
Jacob Vosmaer dd703b3e2a Remove duplicate code 2014-03-03 08:40:29 +01:00
Binsztock RémyandOlivier Gonzalez e7382de108 Add Gemnasium Service for Gitlab
Conflicts:

	db/schema.rb
2014-02-21 16:25:22 +01:00
Dmitriy Zaporozhets aef782888f Merge pull request #5261 from devaroop/retrieve_ssh_keys_by_ssh
ssh keys publically available for sysadmins via http, the github way
2014-02-11 18:41:10 +02:00
GitLab 4b9c28bccd remove unwanted spaces, reduce diff, clean before merge 2014-02-11 21:12:27 +05:30
Dmitriy Zaporozhets 4ecf30cd5b Fix bug with cross-reference note on commit
It should not set noteable_id if noteable_type is Commit
We have Note#commit_id for this

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-07 12:34:30 +02:00
GitLab b1492a2a62 sync with upstream for ease to merge 2014-02-06 19:47:21 +05:30
GitLab 1c9a41e0d5 adding tests for the ssh keys feature 2014-02-06 14:42:59 +05:30
Steven Thonus 251df827a5 added group avatars 2014-01-28 08:38:00 +01:00
Jason Hollingsworth 39a2adf4f4 Fix broken test in spec/models/project_spec.rb
A test was broken if running on a non-standard port.
Made checking for (non-)standard port more robust.
Changed gitlab_on_non_standard_port to gitlab_on_standard_port (less negative).
2014-01-24 21:14:05 -06:00
Marin Jankovski 54bcb6cc2a Merge branch 'master' into reference_relative_links
Conflicts:
	spec/models/project_spec.rb
2014-01-24 14:02:11 +01:00
Carlos Paramio b373158077 Project name was hardcoded (oops) 2014-01-24 08:42:24 +01:00
Dmitriy Zaporozhets 573f1f4ade Fix project model spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-23 14:23:21 +02:00
Marin Jankovski 3bcfdf07cd Update last sha of the commit in the test seed repository. 2014-01-23 13:06:44 +01:00
Dmitriy Zaporozhets 71851a7e4e Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-23 13:31:16 +02:00
Dmitriy Zaporozhets e013cd44e0 Fix mr specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-23 13:24:25 +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 5f9d90e218 Merge pull request #5958 from brunoga/go-repository-fetch
Added support for Go's repository retrieval.
2014-01-21 02:27:21 -08:00
Bruno Albuquerque e77694bff3 Added a simple test to web_url_without_protocol. 2014-01-20 08:00:50 -05:00
Dmitriy Zaporozhets 3628eb84c4 Merge pull request #6072 from jvanbaarsen/fix-3516
Better check on the validity of emails
2014-01-19 10:29:06 -08:00
Dmitriy Zaporozhets f8aae4b7d8 Merge branch 'add_website_url_to_user' of https://github.com/jeromedalbert/gitlabhq into jeromedalbert-add_website_url_to_user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-01-19 20:23:29 +02:00
Jerome Dalbert 2e3f250d45 Add website url to user 2014-01-18 19:15:10 +00:00