Commit Graph
6548 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets edd2143d35 Namespaces.owner_id can be null 2013-09-26 14:48:58 +03:00
Dmitriy Zaporozhets 3cb663f5c9 Remove project transfer page since we already have multiple owners for group 2013-09-26 10:33:06 +03:00
Dmitriy Zaporozhets 02cf9aa687 Group owner or admin can remove other group owners 2013-09-26 10:28:43 +03:00
Dmitriy Zaporozhets 8674e1c227 Group has multiple owners so no sense to show one at dashboard list 2013-09-26 10:02:18 +03:00
Dmitriy Zaporozhets a59330998e Fix remove snippet test 2013-09-25 21:33:35 +03:00
Dmitriy Zaporozhets b6adabb45d Merge branch '6-1-stable'
Conflicts:
	lib/tasks/gitlab/check.rake
2013-09-25 18:34:50 +03:00
Dmitriy Zaporozhets 82f3446fde Merge pull request #5174 from johannesbecker/service-pivotaltracker
PivotalTracker Source Commits Endpoint
2013-09-25 08:31:39 -07:00
Dmitriy Zaporozhets 7bb03a536a Hide new issue button if not authorized 2013-09-25 18:26:54 +03:00
Johannes Becker fa8588827e Syntax cleanup 2013-09-25 16:54:34 +02:00
Johannes Becker 64e012a378 Added spinach Tests for pivotaltracker service 2013-09-25 16:49:39 +02:00
Dmitriy Zaporozhets c611ea513c Fixed styling for delete button of snippet 2013-09-25 17:20:07 +03:00
Dmitriy Zaporozhets 11605c2d8d Tree files use normal font-weight 2013-09-25 16:59:38 +03:00
Dmitriy Zaporozhets 1165759b14 Merge pull request #5146 from karlhungus/feature-api-search-for-projects-by-name
Added search for projects by name to api
2013-09-25 06:57:34 -07:00
Dmitriy Zaporozhets 203bc7bb7e Hide some filters if current_user is nil 2013-09-25 16:54:36 +03:00
Dmitriy Zaporozhets 9d33c72616 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-09-25 16:25:56 +03:00
Dmitriy Zaporozhets f1fd47875c Merge branch 'epic/public_projects' of /home/git/repositories/gitlab/gitlabhq 2013-09-25 13:25:47 +00:00
Dmitriy Zaporozhets e8292e733b Mention public projects in CHANGELOG 2013-09-25 15:49:35 +03:00
Jacob Vosmaer 923ef6df62 Merge pull request #4800 from Rovanion/patch-1
Remove -y option when removing ruby1.8
2013-09-25 05:19:16 -07:00
Dmitriy Zaporozhets 0a01994466 Fix public project tests 2013-09-25 14:23:06 +03:00
Dmitriy Zaporozhets 573d367be5 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
2013-09-25 14:05:35 +03:00
Dmitriy Zaporozhets 087d7e554f Extend profile security specs 2013-09-25 14:05:03 +03:00
Dmitriy Zaporozhets bae15dc5f7 Version up to 6.2.0.pre 2013-09-25 14:04:32 +03:00
Dmitriy Zaporozhets 6954d50fd3 Dashboard security specs 2013-09-25 14:04:16 +03:00
Dmitriy Zaporozhets ea779cc5ab Public/Private projects security specs 2013-09-25 14:04:01 +03:00
Dmitriy Zaporozhets bcdc7b5d63 Group security tests 2013-09-25 13:27:16 +03:00
Dmitriy Zaporozhets a3c8067325 Merge branch 'gitlab-shell-check' of /home/git/repositories/gitlab/gitlabhq 2013-09-25 06:09:56 +00:00
Johannes Becker 435a5ff8a1 Remove not needed attr_accessible 2013-09-25 01:09:33 +02:00
Johannes Becker 35597f61aa Simple PivotalTracker Source Commits Service 2013-09-25 00:56:25 +02:00
Dmitriy Zaporozhets 2f6342978b 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
2013-09-24 22:14:28 +03:00
Dmitriy Zaporozhets 61eb050993 Different layout for browsing public area and public project page while not logged-in 2013-09-24 22:14:03 +03:00
Dmitriy Zaporozhets d90462033e Remove writing issues/notes from non-auth user abilities 2013-09-24 22:13:28 +03:00
Dmitriy Zaporozhets 09cb2ba815 Fix password update 2013-09-24 22:12:48 +03:00
Izaak Alpert 04c7c262a7 Used pagnation function from api helpers
Change-Id: I1bdd3608d3b46924b5da3ae282c99f85ee4e0dab
2013-09-24 09:22:46 -04:00
Dmitriy Zaporozhets ffd0a985ee Point to project page from public area 2013-09-24 16:00:21 +03:00
Dmitriy Zaporozhets 66998f6d46 Allow non authenticated user access to public projects 2013-09-24 15:58:39 +03:00
Jacob Vosmaer ddf873ad5e 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`.
2013-09-24 14:36:57 +02:00
Dmitriy Zaporozhets 0009016b68 Fix commits table highlight 2013-09-24 11:50:37 +00:00
Dmitriy Zaporozhets e894e3eea5 Restyle sign-in page. Mention public projects 2013-09-24 12:27:25 +03:00
Dmitriy Zaporozhets 9587506124 Dont override default table with bootstrap class. Refactor table css 2013-09-24 12:08:28 +03:00
Dmitriy Zaporozhets 550c1828a3 Merge branch 'feature/require_old_pass' of /home/git/repositories/gitlab/gitlabhq 2013-09-24 08:28:42 +00:00
Dmitriy Zaporozhets 642398285d Force user to provide old password in order to change it 2013-09-24 10:48:36 +03:00
Dmitriy Zaporozhets daf2cf62d7 Merge pull request #5163 from hiroponz/update-check-script-in-stable-branch
Update check script in stable branch
2013-09-24 00:20:34 -07:00
Hiroyuki Sato a5e19c4edc Update check script
* GitLab Shell 1.7.1 is required
* Global projects are not supported (refs #5152)
2013-09-24 15:32:56 +09:00
Izaak Alpert 9d06921ffb Added missing API documentation
Change-Id: I1337ee7ff51d018d6f62d447345032597e84269f
2013-09-23 19:36:39 -04:00
Izaak Alpert 4cfbfbb845 Added search for projects by name to api
GITLAB-1283 (GITLAB-869)

Change-Id: I611e7e93f6292de08e1edc8d3ea77cf9087b6ded

Conflicts:
	config/initializers/1_settings.rb
2013-09-23 19:36:25 -04:00
Dmitriy Zaporozhets 0630be3828 Merge pull request #5063 from karlhungus/feature-allow-ldap-update-with-username
Allows username only updates to ldap properties
2013-09-22 23:58:24 -07:00
Izaak Alpert 8a8123a3d4 Update for readability
fixed a test a broke in the configurable theme PR
Change-Id: Id894506941bc01ab0d259d48ca7ff9b80bb2c57e
2013-09-22 20:56:17 -04:00
Izaak Alpert 75b2ff8f43 Added ldap tests
Change-Id: Ifd77615b3b92d7d8bca92b8875aa8204356cfd85
2013-09-22 20:25:47 -04:00
Izaak Alpert 4fcc17e667 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
2013-09-22 20:25:47 -04:00
Dmitriy Zaporozhets e4ba9349a3 Merge pull request #5149 from hiroponz/fix-api-merge-request
Fix API::MergeRequest in 6-1-stable
2013-09-22 04:52:30 -07:00