home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,504 Commits 48 Branches 340 Tags
ffd0a985ee86691ddb4807cf9be267bdd37c7815
Commit Graph
6504 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 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 089f0000ca Merge pull request #5136 from f0k/patch-1 
Remove old assets before compiling new ones
 2013-09-22 02:22:51 -07:00
Dmitriy Zaporozhets 7be084b13a Merge pull request #5142 from karlhungus/bugfix-handle-empty-public-projects 
Prevent empty public projects from throwing exceptions
 2013-09-22 02:21:33 -07:00
Dmitriy Zaporozhets 5bc07b2ad8 Merge pull request #5116 from karlhungus/feature-configurable-theme 
Make users theme configurable
 2013-09-22 02:20:26 -07:00
Dmitriy Zaporozhets 0d23ea294d Merge pull request #5145 from hiroponz/fix-api-merge-request 
Fix API::MergeRequest
 2013-09-22 02:16:13 -07:00
Spencer OwenandMarin Jankovski 3d2ec9fe00 Corrects the update document to match the version of gitshell specified in the install document (1.7.1) 2013-09-22 10:52:42 +02:00
Marin Jankovski 3f0f30d04d Merge branch '6-1-stable' 2013-09-22 10:49:32 +02:00
Dmitriy Zaporozhets 8fb83bc81e Fix hover for tree view 2013-09-22 08:48:04 +00:00
Marin Jankovski dcf9abc1b1 Version 6.1.0 v6.1.0 2013-09-22 10:45:19 +02:00
Izaak Alpert fcba0d55f4 Defaulted theme to MARS 
Change-Id: I02814fb47edcc915309183547cc8dcb165100f4f
 2013-09-22 01:06:22 -04:00
Izaak Alpert 51e6095dd1 Make users theme configurable 
GITLAB-1262

Change-Id: I690cb8ea294df53ebe8405a519c23c501af2c21a

Conflicts:
	app/models/user.rb
	config/initializers/1_settings.rb
	spec/models/user_spec.rb
 2013-09-22 01:05:14 -04:00
Hiroyuki Sato d426195df8 Fix API::MergeRequest 
Fixes #5144 Refs #4996
 2013-09-22 08:21:22 +09:00
Sytse Sijbrandij 5367e42bd6 Restyle event title 2013-09-21 20:59:46 +02:00
Sytse Sijbrandij 1a5cde17ac Restyle tree table UI 2013-09-21 20:34:14 +02:00
Sytse Sijbrandij 731619ac5c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2013-09-21 18:55:28 +02:00
Sytse Sijbrandij 687cd9fa5b Update gitlab_git to version 2.3.1 2013-09-21 18:54:18 +02:00
Dmitriy Zaporozhets 09e4ecfbc6 Merge branch 'update_changelog' of /home/git/repositories/axil/gitlabhq 2013-09-21 08:01:52 +00:00
Izaak Alpert 61a86101e8 Prevent empty public projects from throwing exceptions 
GITLAB-1279 (GITLAB-1264)

Change-Id: Ifb5b4313bc91fae720f8ef5c36152c45e9d38934
 2013-09-20 11:42:38 -04:00
Jan Schlüter a47fe72ad6 remove old assets before compiling 2013-09-19 19:25:40 +02:00
Axilleas Pipinellis ed68bf7ebf Add author of new init script 2013-09-19 16:36:37 +03:00
Sytse Sijbrandij 05ef996e52 README improved. Removed travis badge 2013-09-19 10:45:31 +02:00
Dmitriy Zaporozhets d4c4fc35a6 Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq 2013-09-18 22:48:13 +00:00
Dmitriy Zaporozhets 540b3ee563 Merge pull request #5099 from yatishmehta27/gitignore-changes 
Added .ruby-version & .ruby-gemset in .gitignore
 2013-09-18 15:47:23 -07:00
Dmitriy Zaporozhets 6a8b9ed8d1 Merge branch 'changelog-specifics' of /home/git/repositories/gitlab/gitlabhq 2013-09-18 22:46:04 +00:00
Sytse Sijbrandij 300f2444a8 Add author and issue id warning. 2013-09-18 09:35:38 +02:00
Dmitriy Zaporozhets 8672203baf Merge pull request #5112 from hiroponz/drop-support-of-root-namespace 
Drop support of root namespace in model
 2013-09-17 23:57:17 -07:00
Dmitriy Zaporozhets 9fabd70323 Merge pull request #5117 from karlhungus/feature-password-update-skipped-when-ldap-user 
Don't show users password change page if ldap users
 2013-09-17 23:54:37 -07:00
Izaak Alpert ca1b67ce38 Don't show users password change page if ldap users 2013-09-17 22:38:08 -04:00
Hiroyuki Sato a3ef683108 Drop support of root namespace in model 2013-09-17 23:05:42 +09:00
Yatish Mehta 1b1c81b175 Added .ruby-version & .ruby-gemset in .gitignore 2013-09-16 19:19:04 +05:30
Dmitriy Zaporozhets 16b6040c2e Update docs to use 6-1-stable branch 2013-09-16 14:04:22 +03:00
Dmitriy Zaporozhets 9c629a1ebc Update gitlab_git to version 2.2.0. Fixes invalid diff in Compare 2013-09-16 13:33:34 +03:00
Dmitriy Zaporozhets 2d31a9f345 Merge pull request #5093 from smashwilson/example-config-fix 
Fix issue_closing_regex in gitlab.yml.example
 2013-09-15 22:59:11 -07:00
Ash Wilson 8bbb5628c4 Don't quote the default issue closing regex. 
It turns out that regex escapes and YAML quoted-scalar escapes don't play
nicely together.
 2013-09-15 15:46:32 -04:00
Dmitriy Zaporozhets e0e88cddd8 Fix tests 2013-09-14 22:01:31 +03:00
Dmitriy Zaporozhets 90dc5ff5fd Fix 500 error on admin->project page 2013-09-14 21:18:01 +03:00
Dmitriy Zaporozhets 74a621385f Extend user infiormation displayed on admin user page 2013-09-14 20:55:33 +03:00
Dmitriy Zaporozhets a51562d6d9 Fix setting default values for user 2013-09-14 20:51:16 +03:00
Dmitriy Zaporozhets 3fe2558a5c Let it be 6.1.0.rc1 2013-09-14 18:25:42 +03:00
Dmitriy Zaporozhets 7311477e48 Update CHANGELOG with new entries for 6.1 2013-09-14 18:24:55 +03:00
Dmitriy Zaporozhets 9f2e19b064 Merge pull request #5084 from spudstud/patch-2 
Update unicorn.rb.example
 2013-09-14 08:09:36 -07:00