Commit Graph
344 Commits
Author SHA1 Message Date
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
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
Dmitriy Zaporozhets 4a1654ed6a Replace context with service in specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-16 20:29:18 +02:00
Jeroen van Baarsen 05e4af5b4c Better check on the validity of emails
At this moment it was possible to enter emails like:
mailto:info@example.com. This was causing some issue in the frontend,
since those links became html mailto: links.

Fixes: #3516
2014-01-16 12:14:47 +01:00
Drew Blessing 09cbe95b20 Add note for assignee changes
Change to username per @PixnBits suggestion
2014-01-06 15:38:13 -06:00
Dmitriy Zaporozhets 62f1c97720 Add User#avatar_type tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-24 10:55:45 +02:00
Andrew Tomaka 0760ba3efb Customization and previewing of broadcast messages 2013-12-18 17:43:45 -05:00
Steven Thonus 37383966ef Archiving old projects; archived projects aren't shown on dashboard
features for archive projects
abilities for archived project
other abilities for archive projects

only limit commits and merges for archived projects

ability changed to prohibited actions on archived projects

added spec and feature tests for archive projects

changed search bar not to include archived projects
2013-12-16 14:39:14 +01:00
skv d89527839e fix most of warnings 2013-12-15 00:05:10 +04:00
Dmitriy Zaporozhets 8c5aa5e3b1 Fix test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-12 14:20:08 +02:00
Dmitriy Zaporozhets 7db71b9476 Fix project models specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 13:41:38 +02:00
Dmitriy Zaporozhets d4c50dbd33 Annotate web_hooks table
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-04 13:37:17 +02:00
vagrant 64efc05229 added thumbsup and thumsdown emoji voting with rspec tests 2013-11-28 20:05:37 +00:00
Jason Hollingsworth d9bb4230cc Adding authenticated public mode (internal).
Added visibility_level icons to project view (rather than just text).
Added public projects to search results.
Added ability to restrict visibility levels standard users can set.
2013-11-26 22:22:07 -06: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
Carlos Paramio 4db87f7c4b Integration with Assembla 2013-11-21 13:18:02 +01:00
Dmitriy Zaporozhets 201d489780 Annotate
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 14:10:03 +02:00
Dmitriy Zaporozhets c5b667351a Show broadcast message to users
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 15:08:20 +02:00
Dmitriy Zaporozhets f1ecf53c1e Broadcast message model + migrations
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 13:47:28 +02:00