home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
147 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' " 
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
 2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets 9f10943c1a Revert "Merge branch 'drop-satellites'" 
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 10:28:42 +02:00
Dmitriy Zaporozhets b48b07044b Merge branch 'master' into drop-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-04 16:42:36 +02:00
Atsushi Ishida f33898ecfb Re-annotate models 2015-08-03 01:52:54 +09:00
Douwe Maan 72c552c2d4 Fix specs 2015-07-29 13:23:28 +02:00
Dmitriy Zaporozhets a87989fb7d Remove satellites 2015-07-15 15:45:57 +02:00
Robert SpeicherandDmitriy Zaporozhets 5a9ede4721 Update mock and stub syntax for specs 2015-06-22 12:13:46 +02:00
Robert Speicher 47251b85e0 ensure_length_of -> validate_length_of 2015-06-10 01:31:26 -04:00
Robert Speicher c0faf91ff2 Add to_reference for models that support references 
Now there is a single source of information for which attribute a model
uses to be referenced, and its special character.
 2015-05-26 15:48:30 -04:00
Robert Speicher 99fcf2e6fe Improve/add specs for Project#get_issue and #issue_exists? 2015-05-01 13:29:36 -04:00
sue445 51abeaa1bc Expose avatar_url in projects API 
* Impl Project#avatar_url
* Refactor ApplicationHelper: Use Project#avatar_url
* Update changelog
 2015-03-01 10:13:01 +09:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9 
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
 2015-02-14 11:09:23 -07:00
Jeroen van Baarsen 0c4a70a306 Updated rspec to rspec 3.x syntax 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-12 19:17:35 +01:00
Dmitriy Zaporozhets 0a34f2dcb5 Merge pull request #8580 from j0k3r/asana 
Add Asana service
 2015-02-08 01:12:41 -08:00
Dmitriy Zaporozhets c0acb28c4e Annotate models 2015-02-02 10:24:40 -08:00
Jeremy b4d9ceb26f Add Asana service 
Also add ability to render "service.help" in markdown
 2015-02-02 09:59:42 +01:00
Marin Jankovski 0da59cb55b Merge branch 'master' into move_external_issue_tracker_away_from_yml_config 
Conflicts:
	app/models/project.rb
	spec/models/project_spec.rb
 2015-01-26 22:12:53 -08:00
Hannes Rosenögger 70c44a0da2 Fix tests, merge conflicts, some minor issues and make the project avatar feature mergable 2015-01-24 18:51:16 +01:00
Steven ThonusandHannes Rosenögger 42bac7f9f2 adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix 2015-01-24 18:51:16 +01:00
Marin Jankovski c70dcd2907 Merge branch 'master' into move_external_issue_tracker_away_from_yml_config 2015-01-23 12:38:46 -08:00
Marin Jankovski 7c701acf57 Do a check which issue tracker is used inside the project. 2015-01-23 11:01:09 -08:00
Dmitriy Zaporozhets 98ee4a1fa7 Annotate models 2015-01-22 09:40:03 -08:00
Dmitriy Zaporozhets 2139e3519b Refactor merge request refresh logic on push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-11 16:49:26 +02:00
Sullivan SENECHAL d1fa3b336d Add Pushover service integration 
That introduce select field type for services options.
 2014-10-03 13:54:37 +02:00
Dmitriy Zaporozhets a5d23ae3c8 Fix MR commenting system when new commits pushed 
This conmmit fixes wierd behaviour when you see wrong comments about new
commits in merge requests.

Short explanation of a bug:
When you push new commits to project we updated `project.merge_requests`
with comment about push. But `project.merge_requests` includes also
merge requests from forks to origin project. So when you push to master
branch it commented on all merge requests from forks to origin where
source_branch was `master`
 2014-09-23 14:20:21 +03:00
Dmitriy Zaporozhets 8210d81381 Replace old references of users_project & users_group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 19:51:54 +03:00
Dmitriy Zaporozhets 92deb451da Annotate models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-25 12:25:02 +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
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 714f7201d3 Add project stars. 2014-07-17 22:47:16 +02: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 2d87556847 Remove rails observers from application 2014-06-17 22:51:43 +03: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 36f861f1b1 Re-annotate models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 15:05:03 +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 e3fc01b3ea Added Slack service integration. 2014-03-18 18:54:30 +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
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 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
Bruno Albuquerque e77694bff3 Added a simple test to web_url_without_protocol. 2014-01-20 08:00:50 -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
Dmitriy Zaporozhets 7db71b9476 Fix project models specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 13:41:38 +02: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 201d489780 Annotate 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-13 14:10:03 +02:00
Angus MacArthur aefe2e952f Fixing unsafe use of Thread.current variable :current_user 2013-10-16 01:20:53 -04:00
Dmitriy Zaporozhets f4d68f398f set current_user for project spec 2013-10-15 11:29:22 +03:00