deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4458 commits 6 branches 43 tags 25 MiB
Commit graph

4458 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dmitriy Zaporozhets 28da2a8bdc Monkeypatch satellite call for merge request in tests 2013-02-21 11:44:33 +02:00
Dmitriy Zaporozhets 42ce2c1080 improve selectors to pass capybara 2.0 2013-02-21 11:27:22 +02:00
Dmitriy Zaporozhets 03f6a28ec0 move capybara scenarios to spec/features 2013-02-21 10:41:37 +02:00
Dmitriy Zaporozhets 9f722427e5 Add LoginHelpers to feature type 2013-02-21 10:41:13 +02:00
Dmitriy Zaporozhets 830da0c218 Update capybara, poltergeist, spinach, rspec-rails 2013-02-21 10:28:13 +02:00
Dmitriy Zaporozhets af3138e801 Update sidekiq 2013-02-21 10:00:18 +02:00
Dmitriy Zaporozhets 585259b837 Fix merge state detection 2013-02-21 09:25:07 +02:00
Sebastian Ziebell 4a60c377b8 API documentation update for milestones 
Updated the milestones API documentation and added return codes descriptions.
 2013-02-20 22:51:59 +01:00
mikew 4243105eb5 deploys under git user 2013-02-20 17:11:41 -04:30
Sebastian Ziebell 33c1463645 API: fixes return codes for notes, documentation updated 
The notes API documentation updated with return codes. API now returns `400 Bad Request` if
required attributes are not present. Return codes are documented now, also tested in added tests.
The documentation now reflects the current state of the API.
 2013-02-20 22:17:05 +01:00
Axilleas Pipinellis a3bbc5956b We don't need to check .profile now that gitolite is replaced by gitlab-shell 2013-02-20 17:36:09 +02:00
Andrew8xx8 6d68923edc human_merge_status replaced by human_merge_status_name 2013-02-20 17:50:29 +04:00
Andrew8xx8 52e0df5c23 class.self methods moved to scopes 2013-02-20 17:50:24 +04:00
Andrew8xx8 e2d94e0719 State machine added for merge_status field 2013-02-20 17:49:48 +04:00
Andrew8xx8 1b7b17d12a Database schema updated 2013-02-20 17:49:40 +04:00
Andrew8xx8 8ba27b7b46 Migrations for convertion merge_status added 2013-02-20 17:49:33 +04:00
Sebastian Ziebell f0e417091c Merge branch 'master' into fixes/api 
Conflicts:
	spec/requests/api/projects_spec.rb
 2013-02-20 14:30:11 +01:00
Dmitriy Zaporozhets ba1a453ef3 Merge pull request #3053 from m4tthumphrey/api-delete-hook-by-id 
Fix RESTfulness of project hook deletions by API
 2013-02-20 05:22:38 -08:00
Sebastian Ziebell 512d826cc3 API: fixes test if project limit is reached 
Fixes a test that checks if the project limit is reached.
 2013-02-20 14:15:04 +01:00
Matt Humphrey dddf6eab2d Removed unnecessary paramter hash. Also tidied up hash format in hook creation spec 2013-02-20 11:45:54 +00:00
Sebastian Ziebell eefb27f5ae Merge branch 'master' into fixes/api 
Conflicts:
	spec/requests/api/projects_spec.rb
 2013-02-20 12:43:32 +01:00
Matt Humphrey 33c513274d Fix RESTfulness of project hook deletions by API 2013-02-20 11:35:36 +00:00
Andrew8xx8 99760edc75 Method moved to service 2013-02-20 15:33:03 +04:00
Sebastian Ziebell 1b97a2eee8 API: fixes return codes, documentation updated with status codes, tests added 
The users API updated with return codes, e.g. if required parameters are missing
a `400 Bad Request` error is returned instead of `404`. Fixes return codes of functions,
e.g. deletion of a ssh key is an idempotent function now.
The API documentation is updated to reflect the current status of the API. Descriptions
are more detailed and complete, infos to return values are added to all functions.
 2013-02-20 12:23:56 +01:00
Andrew8xx8 aa1780d03c System hooks execution moved to System hook service 2013-02-20 14:53:15 +04:00
Dmitriy Zaporozhets b7ac654b88 Merge pull request #2988 from Asquera/error_project_limit 
API: creating last project before limit returns 404
 2013-02-20 02:47:30 -08:00
Dmitriy Zaporozhets 25e4c512d4 Merge pull request #3011 from Asquera/fix_access_to_nonvisible_hook 
API: fixes visibility of project hook
 2013-02-20 02:45:07 -08:00
Dmitriy Zaporozhets c56d32c73e Merge pull request #3038 from dmedvinsky/commit-time 
Add commit full time tooltip to `commited_ago`
 2013-02-20 02:41:35 -08:00
Dmitriy Zaporozhets 36ea32162d Merge pull request #3045 from eldios/patch-1 
Update doc/install/installation.md
 2013-02-20 02:29:16 -08:00
Dmitriy Zaporozhets e7a5ec3376 Merge pull request #3043 from sjmulder/state-seed 
Update seeds for state columns
 2013-02-20 02:28:44 -08:00
Andrew8xx8 468c8c5f0a A little bit of codestyle improvments 2013-02-20 13:15:56 +04:00
Nihad Abbasov 08f665cf28 API docs: fix new milestone parameters 2013-02-20 11:41:32 +04:00
Mike Wyatt c6f5b96ba8 allow force=yes rake gitlab:setup for capistrano deploy:cold 2013-02-20 00:14:03 -03:30
Mike Wyatt bed500090e Capistrano deployment example scripts 2013-02-20 00:13:18 -03:30
Lele 49a46d6ca9 Update doc/install/installation.md 
changed installation overview list step #4
Gitolite -> GitLab shell
 2013-02-20 02:01:39 +01:00
Sijmen Mulder 3a45e6010f Update seeds for state columns 2013-02-19 22:14:28 +01:00
Dmitry Medvinsky eb58529757 Add commit full time tooltip to commited_ago 2013-02-19 19:56:43 +04:00
Dmitriy Zaporozhets 6bc9249b38 Merge pull request #3034 from Andrew8xx8/patch-2 
Event already has author relation
 2013-02-19 03:27:42 -08:00
Andrew Kulakov 303fb06c96 Event already has author relation 2013-02-19 15:22:29 +04:00
Dmitriy Zaporozhets 401041cfd6 Merge pull request #3032 from raphendyr/fix_development_environment 
Fix development fixture for gitlab_shell
 2013-02-19 01:49:36 -08:00
Dmitriy Zaporozhets 67465dc5ef Fix private flag for project 2013-02-19 11:45:49 +02:00
Jaakko Kantojärvi fab586bc87 Fix development fixture for gitlab_shell 2013-02-19 11:17:59 +02:00
Dmitriy Zaporozhets 5d72a3e133 Merge branch 'Undev-state-machine' 2013-02-19 11:04:54 +02:00
Dmitriy Zaporozhets 155703c613 Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine 
Conflicts:
	app/models/issue.rb
	app/models/merge_request.rb
 2013-02-19 11:01:19 +02:00
Andrew8xx8 6e333d5075 Javascript widget fixed 2013-02-19 12:57:09 +04:00
Dmitriy Zaporozhets 52028dcd2d Merge pull request #3013 from crystax/master 
Sort groups alphabetically on dashboard page
 2013-02-19 00:51:08 -08:00
Dmitriy Zaporozhets bfc359ca61 Fix project filter for MR on dashboard 2013-02-19 09:43:41 +02:00
Andrew8xx8 d58eb62d68 Migrations iproved 2013-02-19 11:32:10 +04:00
Dmitry Moskalchuk f7ae1bce25 Syntax fix of sorting groups/users 2013-02-19 11:13:19 +04:00
Dmitriy Zaporozhets ba937b2b3d Dont show assigned_teams block unless any. Show count in filter 2013-02-18 21:21:24 +02:00