OSDN Git Service
Dmitriy Zaporozhets [Fri, 4 Oct 2013 13:26:49 +0000 (13:26 +0000)]
Merge branch 'satellite_merge' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Fri, 4 Oct 2013 11:26:48 +0000 (13:26 +0200)]
Remove outdated comments.
Dmitriy Zaporozhets [Fri, 4 Oct 2013 11:24:27 +0000 (11:24 +0000)]
Merge branch 'improve_sidekiq_check' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 4 Oct 2013 11:22:43 +0000 (14:22 +0300)]
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 4 Oct 2013 11:17:12 +0000 (11:17 +0000)]
Merge branch 'requirements-cloud-experience' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Fri, 4 Oct 2013 10:38:49 +0000 (12:38 +0200)]
Fix failed merge when filename is the same as target branchname.
Sytse Sijbrandij [Fri, 4 Oct 2013 10:20:40 +0000 (12:20 +0200)]
Better requirements based on the experience of GitLab Cloud.
Jacob Vosmaer [Fri, 4 Oct 2013 09:18:44 +0000 (11:18 +0200)]
Only kill sidekiqs belonging to gitlab user
Jacob Vosmaer [Thu, 3 Oct 2013 13:21:05 +0000 (06:21 -0700)]
Merge pull request #5262 from yatish27/master
Typo:Corrected the typo of sign-in in User Model
Jacob Vosmaer [Thu, 3 Oct 2013 13:17:27 +0000 (06:17 -0700)]
Merge pull request #5160 from nummy/patch-1
Improve 6.0-to-6.1.md update guide
Yatish Mehta [Thu, 3 Oct 2013 09:04:51 +0000 (14:34 +0530)]
Typo:Corrected the typo of sign-in in User Model
Dmitriy Zaporozhets [Thu, 3 Oct 2013 06:33:39 +0000 (09:33 +0300)]
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 3 Oct 2013 06:27:47 +0000 (06:27 +0000)]
Merge branch 'update_api_documentation' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Wed, 2 Oct 2013 14:41:01 +0000 (16:41 +0200)]
Update group access levels in docs.
Dmitriy Zaporozhets [Wed, 2 Oct 2013 14:14:49 +0000 (14:14 +0000)]
Merge branch 'broader-message-matching' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 2 Oct 2013 14:14:09 +0000 (14:14 +0000)]
Merge branch 'pg_installation' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 2 Oct 2013 14:11:08 +0000 (14:11 +0000)]
Merge branch 'new-site' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 2 Oct 2013 14:10:44 +0000 (14:10 +0000)]
Merge branch 'add-backup-to-readme' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Wed, 2 Oct 2013 13:02:54 +0000 (15:02 +0200)]
Add direct link to backup task and some other interfaces.
Sytse Sijbrandij [Wed, 2 Oct 2013 12:43:11 +0000 (14:43 +0200)]
Adapt readme to website redesign.
Marin Jankovski [Wed, 2 Oct 2013 10:51:43 +0000 (12:51 +0200)]
Removed user teams api docs.
Marin Jankovski [Wed, 2 Oct 2013 10:50:01 +0000 (12:50 +0200)]
Update deploy keys, groups and system hooks api docs.
Marin Jankovski [Wed, 2 Oct 2013 10:08:07 +0000 (12:08 +0200)]
Update issues, milestones, notes api docs.
Marin Jankovski [Wed, 2 Oct 2013 09:04:51 +0000 (11:04 +0200)]
Update snippets and merge request api documentation
Jacob Vosmaer [Wed, 2 Oct 2013 08:28:01 +0000 (10:28 +0200)]
Use mkdir -p in 4.2-to-5.0.md update guide
Jacob Vosmaer [Wed, 2 Oct 2013 07:29:40 +0000 (09:29 +0200)]
Add -H to sudo commands in 4.1-to-4.2.md
Sytse Sijbrandij [Wed, 2 Oct 2013 06:23:27 +0000 (08:23 +0200)]
Correct spelling mistake.
Jacob Vosmaer [Wed, 2 Oct 2013 06:05:52 +0000 (08:05 +0200)]
Use peer-based authentication for PostgreSQL
Jacob Vosmaer [Wed, 2 Oct 2013 06:05:32 +0000 (08:05 +0200)]
Streamline MySQL setup in installation.md
Marin Jankovski [Tue, 1 Oct 2013 21:13:09 +0000 (23:13 +0200)]
Update project api docs.
Dmitriy Zaporozhets [Tue, 1 Oct 2013 17:34:41 +0000 (20:34 +0300)]
Refactor blob finding
Dmitriy Zaporozhets [Tue, 1 Oct 2013 16:12:56 +0000 (16:12 +0000)]
Merge branch 'improve/gitlab_git_3' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 1 Oct 2013 15:26:55 +0000 (18:26 +0300)]
Fix blob and repo stuff after gitlab_git v3
Dmitriy Zaporozhets [Tue, 1 Oct 2013 14:08:40 +0000 (17:08 +0300)]
Fix edit file
Dmitriy Zaporozhets [Tue, 1 Oct 2013 14:00:28 +0000 (17:00 +0300)]
Update code to work with gitlab_git 3
Dmitriy Zaporozhets [Tue, 1 Oct 2013 12:15:28 +0000 (15:15 +0300)]
Annotate!
Dmitriy Zaporozhets [Tue, 1 Oct 2013 12:15:14 +0000 (15:15 +0300)]
Use annotate from rubygems
Marin Jankovski [Tue, 1 Oct 2013 11:52:57 +0000 (13:52 +0200)]
Update user api documentation
Sytse Sijbrandij [Tue, 1 Oct 2013 09:43:53 +0000 (11:43 +0200)]
Also update example.
Sytse Sijbrandij [Tue, 1 Oct 2013 08:53:44 +0000 (10:53 +0200)]
Also match if it is at the end or in the middle of a sentence.
Dmitriy Zaporozhets [Tue, 1 Oct 2013 08:14:05 +0000 (08:14 +0000)]
Merge branch 'rack_attack' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Tue, 1 Oct 2013 08:05:58 +0000 (10:05 +0200)]
Update install/update docs.
Dmitriy Zaporozhets [Mon, 30 Sep 2013 14:04:40 +0000 (07:04 -0700)]
Merge pull request #5200 from pfaro/bugfix-signup
Add check if the signup setting is enabled. fixes #4832
Dmitriy Zaporozhets [Mon, 30 Sep 2013 13:49:55 +0000 (16:49 +0300)]
Refactor API: project hooks
Dmitriy Zaporozhets [Mon, 30 Sep 2013 13:47:26 +0000 (16:47 +0300)]
API: Protect project deploy keys from unauthorized access
Jacob Vosmaer [Mon, 30 Sep 2013 12:42:59 +0000 (05:42 -0700)]
Merge pull request #4902 from misilot/missing-config-unicorn.rb
Add hints for relative URL installation
Dmitriy Zaporozhets [Mon, 30 Sep 2013 10:59:29 +0000 (13:59 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Mon, 30 Sep 2013 10:59:16 +0000 (13:59 +0300)]
Remove grit require
Dmitriy Zaporozhets [Mon, 30 Sep 2013 09:50:31 +0000 (02:50 -0700)]
Merge pull request #5221 from Turbo87/patch-1
Fixed typo in groups.md
Marin Jankovski [Thu, 26 Sep 2013 20:40:55 +0000 (22:40 +0200)]
Add documentation to help section, rack_attack as example
Tobias Bieniek [Mon, 30 Sep 2013 09:01:57 +0000 (11:01 +0200)]
Fixed typo in groups.md
Dmitriy Zaporozhets [Mon, 30 Sep 2013 06:55:48 +0000 (09:55 +0300)]
Fix Api session spec
Dmitriy Zaporozhets [Mon, 30 Sep 2013 06:50:30 +0000 (09:50 +0300)]
Few UI fixes for notes
Dmitriy Zaporozhets [Mon, 30 Sep 2013 06:27:45 +0000 (09:27 +0300)]
Add more entries to 6.2.0 CHANGELOG
Dmitriy Zaporozhets [Mon, 30 Sep 2013 06:03:46 +0000 (23:03 -0700)]
Merge pull request #5213 from bladealslayer/feature/user_api_extended
Extended User API to expose admin and can_create_group for user creation...
Dmitriy Zaporozhets [Sun, 29 Sep 2013 20:36:44 +0000 (23:36 +0300)]
Make rake gitlab:test works
Thomas Misilo [Sun, 29 Sep 2013 17:46:02 +0000 (13:46 -0400)]
Changed wording in application.rb and gitlab.yml.example to match unicorn.rb. This is for when using a non-root path
Boyan Tabakov [Sun, 29 Sep 2013 16:55:09 +0000 (19:55 +0300)]
Added test cases to verify admin status of users created via API.
Dmitriy Zaporozhets [Sun, 29 Sep 2013 14:45:43 +0000 (17:45 +0300)]
Use gitlab:test for travis-ci
Dmitriy Zaporozhets [Sun, 29 Sep 2013 14:43:59 +0000 (17:43 +0300)]
Use phantomjs for jasmine tests. Fixed broken one
Dmitriy Zaporozhets [Sun, 29 Sep 2013 14:43:33 +0000 (17:43 +0300)]
gitlab:test rake task now includes jasmine and db setup
Dmitriy Zaporozhets [Sun, 29 Sep 2013 13:51:04 +0000 (13:51 +0000)]
Merge branch 'improve/gems_update' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sun, 29 Sep 2013 13:04:57 +0000 (16:04 +0300)]
Respect authorization in Repository API
* dont allow protect/unprotect branches for users without master permissions
* dont allow access to Repository api for guests
Dmitriy Zaporozhets [Sun, 29 Sep 2013 12:44:49 +0000 (15:44 +0300)]
Update some development dependencies
Dmitriy Zaporozhets [Sun, 29 Sep 2013 12:24:11 +0000 (05:24 -0700)]
Merge pull request #3006 from jweslley/master
add rake tasks for web hooks management
Boyan Tabakov [Wed, 31 Jul 2013 10:52:23 +0000 (13:52 +0300)]
Extended User API to expose admin and can_create_group for user creation/updating.
Also, is_admin and can_create_group are exposed in the user information.
Fixed attributes_for_keys to process properly keys with boolean values (since false.present? is false).
Thomas Misilo [Sat, 28 Sep 2013 11:40:48 +0000 (07:40 -0400)]
Updated at the request of @f0k
Denix [Sun, 25 Aug 2013 21:37:42 +0000 (23:37 +0200)]
Update databases.md
run mysql_secure_installation to secure the freshly installed mysql server
Jacob Vosmaer [Fri, 27 Sep 2013 14:22:18 +0000 (07:22 -0700)]
Merge pull request #5191 from jojosch/fix-check-script-sidekiq
[gitlab:check] Fix detecting the status of sidekiq
Johannes Schleifenbaum [Thu, 26 Sep 2013 13:40:44 +0000 (15:40 +0200)]
[gitlab:check] Fix detecting the status of sidekiq
If you are running another sidekiq instance on your server, e.g. GitLab
CI, the check script would parse the output of `ps aux` searching for
`sidekiq` and returning success, although the GitLab sidekiq may not be
running.
Now the `ps` call will only print the processes run by the GitLab user.
Dmitriy Zaporozhets [Fri, 27 Sep 2013 13:25:24 +0000 (16:25 +0300)]
rewrite issues search test to prevent ajax requests running after test
Thomas Misilo [Fri, 27 Sep 2013 12:39:38 +0000 (08:39 -0400)]
Added reference to the line "ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"" , as it talked about in the gitlab.yml.example
Dmitriy Zaporozhets [Fri, 27 Sep 2013 12:03:37 +0000 (12:03 +0000)]
Merge branch 'only_one_sidekiq' of /home/git/repositories/gitlab/gitlabhq
Jacob Vosmaer [Fri, 27 Sep 2013 10:57:05 +0000 (12:57 +0200)]
Check whether only one sidekiq is running
Perry Faro [Fri, 27 Sep 2013 09:56:30 +0000 (11:56 +0200)]
Add check if the signup setting is enabled. fixes #4832
Dmitriy Zaporozhets [Thu, 26 Sep 2013 19:19:01 +0000 (22:19 +0300)]
Merge branch 'patch-2' of https://github.com/zzet/gitlabhq into zzet-patch-2
Conflicts:
app/controllers/projects/merge_requests_controller.rb
Dmitriy Zaporozhets [Thu, 26 Sep 2013 19:13:57 +0000 (12:13 -0700)]
Merge pull request #5192 from zshannon/patch-1
Fixed grammatical mistake in init.d status output.
Zane Shannon [Thu, 26 Sep 2013 18:01:22 +0000 (13:01 -0500)]
Fixed grammatical mistake in init.d status output.
"its" not "it's".
Dmitriy Zaporozhets [Thu, 26 Sep 2013 16:46:31 +0000 (19:46 +0300)]
Explain on dashboard that limit amount of projects displayed
Dmitriy Zaporozhets [Thu, 26 Sep 2013 16:22:04 +0000 (19:22 +0300)]
Dont test 1.9 with travis
Dmitriy Zaporozhets [Thu, 26 Sep 2013 16:05:55 +0000 (19:05 +0300)]
Fix issues search test
Dmitriy Zaporozhets [Thu, 26 Sep 2013 13:00:11 +0000 (16:00 +0300)]
Add sleep in tests to prevent random failing when next test starts before ajax requests for old one in progress
Dmitriy Zaporozhets [Thu, 26 Sep 2013 12:56:05 +0000 (15:56 +0300)]
Remove issues search rspec since we test it with spinach too
Dmitriy Zaporozhets [Thu, 26 Sep 2013 12:44:09 +0000 (12:44 +0000)]
Merge branch 'refactor/group_owners' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 26 Sep 2013 12:08:33 +0000 (15:08 +0300)]
Mention permissions table on Group#members page
Dmitriy Zaporozhets [Thu, 26 Sep 2013 12:06:00 +0000 (15:06 +0300)]
Mention group permissions on Help#permissions page
Dmitriy Zaporozhets [Thu, 26 Sep 2013 11:52:17 +0000 (14:52 +0300)]
Ignore owner_id for Group in tests
Dmitriy Zaporozhets [Thu, 26 Sep 2013 11:49:22 +0000 (14:49 +0300)]
Group ownership completely based on users_groups relation now
Before we have only owner_id to determine group owner
With multiple owners per group we should get rid of owner_id in group.
So from now @group.owner will always be nil but
@group.owners return an actual array of users who can admin this group
Dmitriy Zaporozhets [Thu, 26 Sep 2013 11:48:58 +0000 (14:48 +0300)]
Namespaces.owner_id can be null
Dmitriy Zaporozhets [Thu, 26 Sep 2013 07:33:06 +0000 (10:33 +0300)]
Remove project transfer page since we already have multiple owners for group
Dmitriy Zaporozhets [Thu, 26 Sep 2013 07:28:43 +0000 (10:28 +0300)]
Group owner or admin can remove other group owners
Dmitriy Zaporozhets [Thu, 26 Sep 2013 07:02:18 +0000 (10:02 +0300)]
Group has multiple owners so no sense to show one at dashboard list
Dmitriy Zaporozhets [Wed, 25 Sep 2013 18:33:35 +0000 (21:33 +0300)]
Fix remove snippet test
Marin Jankovski [Tue, 24 Sep 2013 21:12:31 +0000 (23:12 +0200)]
Enable rack attack and add a throttle.
Dmitriy Zaporozhets [Wed, 25 Sep 2013 15:34:50 +0000 (18:34 +0300)]
Merge branch '6-1-stable'
Conflicts:
lib/tasks/gitlab/check.rake
Dmitriy Zaporozhets [Wed, 25 Sep 2013 15:31:39 +0000 (08:31 -0700)]
Merge pull request #5174 from johannesbecker/service-pivotaltracker
PivotalTracker Source Commits Endpoint
Dmitriy Zaporozhets [Wed, 25 Sep 2013 15:26:54 +0000 (18:26 +0300)]
Hide new issue button if not authorized
Johannes Becker [Wed, 25 Sep 2013 14:54:34 +0000 (16:54 +0200)]
Syntax cleanup
Johannes Becker [Wed, 25 Sep 2013 14:49:39 +0000 (16:49 +0200)]
Added spinach Tests for pivotaltracker service
Dmitriy Zaporozhets [Wed, 25 Sep 2013 14:20:07 +0000 (17:20 +0300)]
Fixed styling for delete button of snippet