home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
7,019 Commits 48 Branches 340 Tags
dfade97edffdec9a1e042c620b98e799d74794cf
Commit Graph
7019 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets dfade97edf Merge branch 'contribution-license-agreement' of /home/git/repositories/gitlab/gitlabhq 2013-11-08 16:33:52 +00:00
Dmitriy Zaporozhets 4b98597edc Add specs for Email confirmation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-08 18:29:26 +02:00
Dmitriy Zaporozhets ce1efb56eb Merge branch 'ra_default' of /home/git/repositories/gitlab/gitlabhq 2013-11-08 16:19:40 +00:00
Dmitriy Zaporozhets f97cb7f11c Merge branch 'no_separate_gem' of /home/git/repositories/gitlab/gitlabhq 2013-11-08 16:18:55 +00:00
Dmitriy Zaporozhets 02484930e1 Removed Project#discover_default_branch since it not needed any more 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-08 09:22:50 +02:00
Marin Jankovski da238bbdf4 Remove separate installation of charlock_holmes. 2013-11-07 09:56:12 +01:00
Dmitriy Zaporozhets c28786ecbe Require gitlab-shell 1.7.6 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 21:52:37 +02:00
Dmitriy Zaporozhets 253680bbff Merge branch 'improve/default_branch' of /home/git/repositories/gitlab/gitlabhq 2013-11-06 18:24:19 +00:00
Dmitriy Zaporozhets 7ab3bf9668 update CHANGELOG with default_branch changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 19:43:51 +02:00
Dmitriy Zaporozhets 0ba378dcb3 Fix spinach tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 19:38:37 +02:00
Dmitriy Zaporozhets cfa15d0846 Remove default_branch support from API project creation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 19:14:11 +02:00
Dmitriy Zaporozhets 580dfe5af9 Replace assign with stub for default_branch 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 19:13:45 +02:00
Dmitriy Zaporozhets 9d14c5137a Project#default_branch use repo HEAD instead of DB value now 
Drop default_branch field from projects table
Use repository.root_ref as value for defautl_branch method
Fixes issue with default_branch and HEAD getting out of sync

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 18:45:39 +02:00
Marin Jankovski 3c8c06751c Enable rack_attack by default. 2013-11-06 13:10:59 +01:00
Dmitriy Zaporozhets d618a5fec3 Refactor search views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 09:58:43 +02:00
Dmitriy Zaporozhets 593b05ea94 Look for project description during search 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 09:54:42 +02:00
Dmitriy Zaporozhets 1a20976aa3 More entries to changelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 09:32:17 +02:00
Dmitriy Zaporozhets 94f8b51cb3 Merge branch 'feature/leave_project' of /home/git/repositories/gitlab/gitlabhq 2013-11-05 15:16:29 +00:00
Dmitriy Zaporozhets b813a4888a Remove User#namespaces method from code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 17:15:43 +02:00
Dmitriy Zaporozhets 6424ec936e Refactor user associations. Drop support of Group#owner_id 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 16:58:13 +02:00
Dmitriy Zaporozhets d78b6ce4cc New feature: Ability to leave project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 16:41:29 +02:00
Dmitriy Zaporozhets f9b66aecdd Revert "More escaping" 
This reverts commit c46eaca912.
 2013-11-05 15:35:49 +02:00
Dmitriy Zaporozhets ad41430c29 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-11-05 13:35:40 +02:00
Dmitriy Zaporozhets 376dd3a383 Merge branch 'feature/create_file' of /home/git/repositories/gitlab/gitlabhq 2013-11-05 11:35:22 +00:00
Dmitriy Zaporozhets 3083e5e4cd Hide new file link if not branch HEAD 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 12:23:11 +02:00
Dmitriy Zaporozhets 160bd862be Refactoring for EditTree and NewTree controllers and contexts 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 12:21:11 +02:00
Dmitriy Zaporozhets f61850e6e3 Move part of file creation logic into separate context 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 12:06:52 +02:00
Dmitriy Zaporozhets f2eb668348 Feature test for New file feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 10:45:23 +02:00
Jacob Vosmaer 71f34f77b3 Merge pull request #5500 from nkukard/esc-strings2 
More escaping
 2013-11-05 00:30:45 -08:00
Dmitriy Zaporozhets bd2b6f5944 New feature: Create file from UI 
Now you are able to create a new file in repository from your browser.
You are not allowed to create a file if file with same name already
exists in the repo.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 10:28:49 +02:00
Nigel Kukard c46eaca912 More escaping 
- Database name may contain characters which are not shell friendly
- Database password could contain the same
- While we at it there is no harm in escaping generated paths too
- Refactored 2-line system(command)

Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
 2013-11-04 22:09:03 +00:00
Dmitriy Zaporozhets 2ee04b120a Merge branch 'consistent-numbering' of /home/git/repositories/gitlab/gitlabhq 2013-11-04 19:37:21 +00:00
Sytse Sijbrandij c467ef5221 Number 3 was missing. 2013-11-04 11:36:07 -08:00
Dmitriy Zaporozhets 400a55805c Merge branch 'gitlab_shell_in_patch_doc' of /home/git/repositories/gitlab/gitlabhq 2013-11-04 19:30:26 +00:00
Jacob Vosmaer 27fe6cbe13 Include gitlab-shell in patch update doc 2013-11-04 20:28:07 +01:00
Dmitriy Zaporozhets 617cc8fb98 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2013-11-04 20:37:15 +02:00
Dmitriy Zaporozhets f41731047f Merge pull request #5507 from jojosch/project-issue-tracker-selection 
Preselect the current issue tracker with selected="selected"
 2013-11-04 10:32:19 -08:00
Dmitriy Zaporozhets d6fce1055a Merge pull request #5521 from mynetx/ie10-css-gradients 
Support -ms-linear-gradient style for IE10+
 2013-11-04 10:31:20 -08:00
Dmitriy Zaporozhets 0cf9c02c52 Merge pull request #5528 from mcepl/patch-1 
Fix name of RHEL
 2013-11-04 10:30:04 -08:00
Dmitriy Zaporozhets 14bc511fbe Merge branch 'security_update_master' of /home/git/repositories/gitlab/gitlabhq 2013-11-04 18:21:22 +00:00
Dmitriy Zaporozhets e1607ec455 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-11-04 19:00:11 +02:00
Dmitriy Zaporozhets a9661c8dfe Merge branch 'ui/namespace_title' of /home/git/repositories/dzaporozhets/gitlabhq 2013-11-04 15:00:35 +00:00
Dmitriy Zaporozhets 6d86b698e3 Always show namespace for project title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-04 15:18:55 +02:00
Matěj Cepl aff447b4dd Fix name of RHEL 
The company is called Red Hat, and its flagship product is Red Hat Enterprise Linux (commonly abbreviated as RHEL). There is no such thing as RedHat (and never was).
 2013-11-04 10:08:13 +01:00
Jacob Vosmaer 186e8ad996 Merge pull request #5400 from lokedhs/master 
When looking up a user by DN, use single scope
 2013-11-04 00:29:14 -08:00
Dmitriy Zaporozhets 5b091c764c Merge pull request #5512 from jhollingsworth/feature/missing-group-500-fix 
Fixes 500 error when user types in wrong group name.
 2013-11-03 23:55:56 -08:00
Dmitriy Zaporozhets 0f665f4176 Merge pull request #5519 from zzet/patch-3 
Run tests in parallel on travis
 2013-11-03 23:48:37 -08:00
Dmitriy Zaporozhets 8e006c64d3 Merge branch 'gitlab_shell_174_for_master' of /home/git/repositories/gitlab/gitlabhq 2013-11-04 07:07:25 +00:00
Elias Mårtenson bc8a875df1 When looking up a user by DN, use single scope 
The blocked? method is used to check whether a user exists in LDAP. Prior to this change, if the LDAP server had more objects below the one pointed to by the DN, those objects would also be picked up by the search, causing the method to determine the user should be blocked.

One case where this can happen is when using Active Directory and a user have a mobile phone assigned. In this case, Exchange will add an entry called ExchangeActiveSyncDevices under the users entry. The user-visible behaviour is then that a user loses Gitlab access when he enables a mobile device.

This fix sets the search scope to BaseObject in order to ensure that only the user itself is returned.
 2013-11-03 21:51:10 +08:00
J.M 68da4154af Support -ms-linear-gradient style for IE10+ 2013-11-02 23:19:35 +01:00