OSDN Git Service
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
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
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
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
Dmitriy Zaporozhets [Wed, 25 Sep 2013 13:59:38 +0000 (16:59 +0300)]
Tree files use normal font-weight
Dmitriy Zaporozhets [Wed, 25 Sep 2013 13:57:34 +0000 (06:57 -0700)]
Merge pull request #5146 from karlhungus/feature-api-search-for-projects-by-name
Added search for projects by name to api
Dmitriy Zaporozhets [Wed, 25 Sep 2013 13:54:36 +0000 (16:54 +0300)]
Hide some filters if current_user is nil
Dmitriy Zaporozhets [Wed, 25 Sep 2013 13:25:56 +0000 (16:25 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Wed, 25 Sep 2013 13:25:47 +0000 (13:25 +0000)]
Merge branch 'epic/public_projects' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 25 Sep 2013 12:49:35 +0000 (15:49 +0300)]
Mention public projects in CHANGELOG
Jacob Vosmaer [Wed, 25 Sep 2013 12:19:16 +0000 (05:19 -0700)]
Merge pull request #4800 from Rovanion/patch-1
Remove -y option when removing ruby1.8
Dmitriy Zaporozhets [Wed, 25 Sep 2013 11:23:06 +0000 (14:23 +0300)]
Fix public project tests
Dmitriy Zaporozhets [Wed, 25 Sep 2013 11:05:35 +0000 (14:05 +0300)]
Modify permissions for project and group
* Hooks and team pages allowed only for masters/owners
* Group page allowed for admin
* Corrent authentication for Projects controller
* Hide some project elements from visitor
Dmitriy Zaporozhets [Wed, 25 Sep 2013 11:05:03 +0000 (14:05 +0300)]
Extend profile security specs
Dmitriy Zaporozhets [Wed, 25 Sep 2013 11:04:32 +0000 (14:04 +0300)]
Version up to 6.2.0.pre
Dmitriy Zaporozhets [Wed, 25 Sep 2013 11:04:16 +0000 (14:04 +0300)]
Dashboard security specs
Dmitriy Zaporozhets [Wed, 25 Sep 2013 11:04:01 +0000 (14:04 +0300)]
Public/Private projects security specs
Dmitriy Zaporozhets [Wed, 25 Sep 2013 10:27:16 +0000 (13:27 +0300)]
Group security tests
Dmitriy Zaporozhets [Wed, 25 Sep 2013 06:09:56 +0000 (06:09 +0000)]
Merge branch 'gitlab-shell-check' of /home/git/repositories/gitlab/gitlabhq
Johannes Becker [Tue, 24 Sep 2013 23:09:33 +0000 (01:09 +0200)]
Remove not needed attr_accessible
Johannes Becker [Tue, 24 Sep 2013 22:56:25 +0000 (00:56 +0200)]
Simple PivotalTracker Source Commits Service
Dmitriy Zaporozhets [Tue, 24 Sep 2013 19:14:28 +0000 (22:14 +0300)]
Public projects feature - step2
* Render right layout depends on current_user
* show sample git username/email when repo is empty
* Show extra info when browsing public area
* Fixed some tests related to public projects
* show comments in read-only for public projects
* Remove old public routing
Dmitriy Zaporozhets [Tue, 24 Sep 2013 19:14:03 +0000 (22:14 +0300)]
Different layout for browsing public area and public project page while not logged-in
Dmitriy Zaporozhets [Tue, 24 Sep 2013 19:13:28 +0000 (22:13 +0300)]
Remove writing issues/notes from non-auth user abilities
Dmitriy Zaporozhets [Tue, 24 Sep 2013 19:12:48 +0000 (22:12 +0300)]
Fix password update
Izaak Alpert [Tue, 24 Sep 2013 13:22:46 +0000 (09:22 -0400)]
Used pagnation function from api helpers
Change-Id: I1bdd3608d3b46924b5da3ae282c99f85ee4e0dab
Dmitriy Zaporozhets [Tue, 24 Sep 2013 13:00:21 +0000 (16:00 +0300)]
Point to project page from public area
Dmitriy Zaporozhets [Tue, 24 Sep 2013 12:58:39 +0000 (15:58 +0300)]
Allow non authenticated user access to public projects
Jacob Vosmaer [Tue, 24 Sep 2013 12:36:57 +0000 (14:36 +0200)]
Add gitlab-shell/bin/check to rake gitlab:check
We sometimes encounter connectivity issues where gitlab-shell cannot
make API calls to the Rails application. There is a self-test script
`gitlab-shell/bin/check` that tries to connect to the API; this commit
runs that script as part of `rake gitlab:check`.
Dmitriy Zaporozhets [Tue, 24 Sep 2013 11:50:37 +0000 (11:50 +0000)]
Fix commits table highlight
Dmitriy Zaporozhets [Tue, 24 Sep 2013 09:27:25 +0000 (12:27 +0300)]
Restyle sign-in page. Mention public projects
Dmitriy Zaporozhets [Tue, 24 Sep 2013 09:08:28 +0000 (12:08 +0300)]
Dont override default table with bootstrap class. Refactor table css
Dmitriy Zaporozhets [Tue, 24 Sep 2013 08:28:42 +0000 (08:28 +0000)]
Merge branch 'feature/require_old_pass' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 24 Sep 2013 07:48:36 +0000 (10:48 +0300)]
Force user to provide old password in order to change it
Dmitriy Zaporozhets [Tue, 24 Sep 2013 07:20:34 +0000 (00:20 -0700)]
Merge pull request #5163 from hiroponz/update-check-script-in-stable-branch
Update check script in stable branch
Hiroyuki Sato [Tue, 24 Sep 2013 06:31:12 +0000 (15:31 +0900)]
Update check script
* GitLab Shell 1.7.1 is required
* Global projects are not supported (refs #5152)
Izaak Alpert [Mon, 23 Sep 2013 23:18:29 +0000 (19:18 -0400)]
Added missing API documentation
Change-Id: I1337ee7ff51d018d6f62d447345032597e84269f
Izaak Alpert [Sun, 22 Sep 2013 04:50:18 +0000 (00:50 -0400)]
Added search for projects by name to api
GITLAB-1283 (GITLAB-869)
Change-Id: I611e7e93f6292de08e1edc8d3ea77cf9087b6ded
Conflicts:
config/initializers/1_settings.rb
Dmitriy Zaporozhets [Mon, 23 Sep 2013 06:58:24 +0000 (23:58 -0700)]
Merge pull request #5063 from karlhungus/feature-allow-ldap-update-with-username
Allows username only updates to ldap properties
Izaak Alpert [Mon, 23 Sep 2013 00:25:10 +0000 (20:25 -0400)]
Update for readability
fixed a test a broke in the configurable theme PR
Change-Id: Id894506941bc01ab0d259d48ca7ff9b80bb2c57e
Izaak Alpert [Mon, 16 Sep 2013 04:40:21 +0000 (00:40 -0400)]
Added ldap tests
Change-Id: Ifd77615b3b92d7d8bca92b8875aa8204356cfd85
Izaak Alpert [Thu, 12 Sep 2013 20:27:51 +0000 (16:27 -0400)]
Allows username only updates to ldap properties
-when logging in if users are allowed to login with just usernames in ldap we will update uid of the user if their uid is out of date
Conflicts:
spec/lib/auth_spec.rb
Change-Id: Ia171b3d5133da86edc18c0d08ecfaf6a174f2574
Dmitriy Zaporozhets [Sun, 22 Sep 2013 11:52:30 +0000 (04:52 -0700)]
Merge pull request #5149 from hiroponz/fix-api-merge-request
Fix API::MergeRequest in 6-1-stable
Hiroyuki Sato [Sat, 21 Sep 2013 21:46:36 +0000 (06:46 +0900)]
Fix API::MergeRequest
Refs #5145
Dmitriy Zaporozhets [Sun, 22 Sep 2013 09:22:51 +0000 (02:22 -0700)]
Merge pull request #5136 from f0k/patch-1
Remove old assets before compiling new ones
Dmitriy Zaporozhets [Sun, 22 Sep 2013 09:21:33 +0000 (02:21 -0700)]
Merge pull request #5142 from karlhungus/bugfix-handle-empty-public-projects
Prevent empty public projects from throwing exceptions
Dmitriy Zaporozhets [Sun, 22 Sep 2013 09:20:26 +0000 (02:20 -0700)]
Merge pull request #5116 from karlhungus/feature-configurable-theme
Make users theme configurable
Dmitriy Zaporozhets [Sun, 22 Sep 2013 09:16:13 +0000 (02:16 -0700)]
Merge pull request #5145 from hiroponz/fix-api-merge-request
Fix API::MergeRequest
Spencer Owen [Tue, 17 Sep 2013 05:52:26 +0000 (23:52 -0600)]
Corrects the update document to match the version of gitshell specified in the install document (1.7.1)
Dmitriy Zaporozhets [Sun, 22 Sep 2013 08:51:21 +0000 (01:51 -0700)]
Merge pull request #5109 from spudstud/6-1-stable
Corrects the update document to match the version of gitshell specified ...
Marin Jankovski [Sun, 22 Sep 2013 08:49:32 +0000 (10:49 +0200)]
Merge branch '6-1-stable'
Dmitriy Zaporozhets [Sun, 22 Sep 2013 08:48:04 +0000 (08:48 +0000)]
Fix hover for tree view