Commit Graph
6604 Commits
Author SHA1 Message Date
devaroop b9d58c4cec getting user keys publically through http without any authentication, the github way. E.g: http://github.com/devaroop.keys
changelog updated to include ssh key retrieval feature update
2013-10-03 12:50:33 +05:30
Dmitriy Zaporozhets e219cf7246 Annotate! 2013-10-01 15:15:28 +03:00
Dmitriy Zaporozhets 4aa2275409 Use annotate from rubygems 2013-10-01 15:15:14 +03:00
Dmitriy Zaporozhets ac6180bcb0 Merge branch 'rack_attack' of /home/git/repositories/gitlab/gitlabhq 2013-10-01 08:14:05 +00:00
Marin Jankovski 775aa5ba7c Update install/update docs. 2013-10-01 10:05:58 +02:00
Dmitriy Zaporozhets 9ffabc6d7e Merge pull request #5200 from pfaro/bugfix-signup
Add check if the signup setting is enabled. fixes #4832
2013-09-30 07:04:40 -07:00
Dmitriy Zaporozhets 715eaed6ae Refactor API: project hooks 2013-09-30 16:49:55 +03:00
Dmitriy Zaporozhets 73f780d640 API: Protect project deploy keys from unauthorized access 2013-09-30 16:47:26 +03:00
Jacob Vosmaer 6c8444f22e Merge pull request #4902 from misilot/missing-config-unicorn.rb
Add hints for relative URL installation
2013-09-30 05:42:59 -07:00
Dmitriy Zaporozhets 4deb457582 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-09-30 13:59:29 +03:00
Dmitriy Zaporozhets 278250821c Remove grit require 2013-09-30 13:59:16 +03:00
Dmitriy Zaporozhets 72fc36e11c Merge pull request #5221 from Turbo87/patch-1
Fixed typo in groups.md
2013-09-30 02:50:31 -07:00
Marin Jankovski 055b60d420 Add documentation to help section, rack_attack as example 2013-09-30 11:10:46 +02:00
Tobias Bieniek 4692612b84 Fixed typo in groups.md 2013-09-30 11:01:57 +02:00
Dmitriy Zaporozhets 51f9c05fb7 Fix Api session spec 2013-09-30 09:55:48 +03:00
Dmitriy Zaporozhets dd2847f538 Few UI fixes for notes 2013-09-30 09:50:30 +03:00
Dmitriy Zaporozhets d18f89dadb Add more entries to 6.2.0 CHANGELOG 2013-09-30 09:27:45 +03:00
Dmitriy Zaporozhets 836104b41a Merge pull request #5213 from bladealslayer/feature/user_api_extended
Extended User API to expose admin and can_create_group for user creation...
2013-09-29 23:03:46 -07:00
Dmitriy Zaporozhets e48c6fab60 Make rake gitlab:test works 2013-09-29 23:36:44 +03:00
Thomas Misilo e99701fbfa Changed wording in application.rb and gitlab.yml.example to match unicorn.rb. This is for when using a non-root path 2013-09-29 13:46:02 -04:00
Boyan Tabakov 5b657a65d4 Added test cases to verify admin status of users created via API. 2013-09-29 19:55:09 +03:00
Dmitriy Zaporozhets 267e8c73f2 Use gitlab:test for travis-ci 2013-09-29 17:45:43 +03:00
Dmitriy Zaporozhets 9da1928faa Use phantomjs for jasmine tests. Fixed broken one 2013-09-29 17:43:59 +03:00
Dmitriy Zaporozhets 9f8d50e996 gitlab:test rake task now includes jasmine and db setup 2013-09-29 17:43:33 +03:00
Dmitriy Zaporozhets fb71426cdb Merge branch 'improve/gems_update' of /home/git/repositories/gitlab/gitlabhq 2013-09-29 13:51:04 +00:00
Dmitriy Zaporozhets 726fa6c76a Respect authorization in Repository API
* dont allow protect/unprotect branches for users without master permissions
* dont allow access to Repository api for guests
2013-09-29 16:04:57 +03:00
Dmitriy Zaporozhets bfb607a073 Update some development dependencies 2013-09-29 15:44:49 +03:00
Dmitriy Zaporozhets 1df225bb38 Merge pull request #3006 from jweslley/master
add rake tasks for web hooks management
2013-09-29 05:24:11 -07:00
Boyan Tabakov 479631aafc 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).
2013-09-29 11:47:29 +03:00
Thomas Misilo b688bac9b6 Updated at the request of @f0k 2013-09-28 07:40:48 -04:00
DenixandJacob Vosmaer cbb5b000c0 Update databases.md
run mysql_secure_installation to secure the freshly installed mysql server
2013-09-27 16:32:09 +02:00
Jacob Vosmaer 883cb467c5 Merge pull request #5191 from jojosch/fix-check-script-sidekiq
[gitlab:check] Fix detecting the status of sidekiq
2013-09-27 07:22:18 -07:00
Johannes Schleifenbaum b5d7bcb784 [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.
2013-09-27 16:06:06 +02:00
Dmitriy Zaporozhets 72dd8011a7 rewrite issues search test to prevent ajax requests running after test 2013-09-27 16:25:24 +03:00
Thomas Misilo 06903b0396 Added reference to the line "ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"" , as it talked about in the gitlab.yml.example 2013-09-27 08:39:38 -04:00
Dmitriy Zaporozhets 13e073e45b Merge branch 'only_one_sidekiq' of /home/git/repositories/gitlab/gitlabhq 2013-09-27 12:03:37 +00:00
Jacob Vosmaer 1a9b0df767 Check whether only one sidekiq is running 2013-09-27 12:57:05 +02:00
Perry Faro 96ae1a8099 Add check if the signup setting is enabled. fixes #4832 2013-09-27 11:56:30 +02:00
Dmitriy Zaporozhets 052a7cc9cd Merge branch 'patch-2' of https://github.com/zzet/gitlabhq into zzet-patch-2
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
2013-09-26 22:19:01 +03:00
Dmitriy Zaporozhets 9bb1e15c83 Merge pull request #5192 from zshannon/patch-1
Fixed grammatical mistake in init.d status output.
2013-09-26 12:13:57 -07:00
Zane Shannon 13d0088407 Fixed grammatical mistake in init.d status output.
"its" not "it's".
2013-09-26 13:01:22 -05:00
Dmitriy Zaporozhets 5e843a1769 Explain on dashboard that limit amount of projects displayed 2013-09-26 19:46:31 +03:00
Dmitriy Zaporozhets a85c58c736 Dont test 1.9 with travis 2013-09-26 19:22:04 +03:00
Dmitriy Zaporozhets 12dd7d2a9a Fix issues search test 2013-09-26 19:05:55 +03:00
Dmitriy Zaporozhets 8063672add Add sleep in tests to prevent random failing when next test starts before ajax requests for old one in progress 2013-09-26 16:00:11 +03:00
Dmitriy Zaporozhets ff765bb27e Remove issues search rspec since we test it with spinach too 2013-09-26 15:56:05 +03:00
Dmitriy Zaporozhets e3f361faed Merge branch 'refactor/group_owners' of /home/git/repositories/gitlab/gitlabhq 2013-09-26 12:44:09 +00:00
Dmitriy Zaporozhets c6096e47d6 Mention permissions table on Group#members page 2013-09-26 15:08:33 +03:00
Dmitriy Zaporozhets 482f64c574 Mention group permissions on Help#permissions page 2013-09-26 15:06:00 +03:00
Dmitriy Zaporozhets 0a2a34a4d1 Ignore owner_id for Group in tests 2013-09-26 14:52:17 +03:00