Dmitriy Zaporozhets
0759dd4513
Namespaces API for admin users
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-15 15:24:10 +02:00
Jacob Vosmaer
0ab0ca0d9d
Use gitlab-shell 1.7.8
2013-11-14 13:35:45 +01:00
Dmitriy Zaporozhets
64edb27aa9
Extend Gitlab#default_regex. Dont allow project path ends with .git
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-13 16:13:40 +02:00
Marin Jankovski
e16eb91299
Merge branch 'master' into relative
2013-11-12 09:26:17 +01:00
Dmitriy Zaporozhets
986697a99b
Refactor Create/Update file context and lib
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-11 14:58:39 +02:00
Dmitriy Zaporozhets
c77d957b36
API: Edit file in repository
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-11 14:58:06 +02:00
Dmitriy Zaporozhets
79afb001ad
Fix type in API doc
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-10 10:43:04 +02:00
Dmitriy Zaporozhets
ca196453f0
Merge branch 'feature/api_create_file' of /home/git/repositories/gitlab/gitlabhq
2013-11-09 09:42:29 +00:00
Dmitriy Zaporozhets
9d79d6e152
Make sure private_token for API is a string
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-08 18:49:38 +02:00
Marin Jankovski
979ca7d6a2
Correct check.
2013-11-08 16:34:15 +01:00
Dmitriy Zaporozhets
0b67606af6
New API: create file in repo
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-07 18:53:09 +02: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
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
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
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
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
Dmitriy Zaporozhets
4c47a89fa5
Require gitlab-shell 1.7.4
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-01 16:58:24 +02:00
Dmitriy Zaporozhets
592d1fabd6
Revert "Escape strings"
...
This reverts commit ce75f46bf7 .
2013-11-01 16:29:28 +02:00
Dmitriy Zaporozhets
482a39abb0
Revert "Best to escape strings not split them"
...
This reverts commit aca7f56fef .
2013-11-01 16:25:06 +02:00
Perry Faro
5d98afb55b
Fix sidekiq start text in documentation and gitlab:check
2013-11-01 11:52:44 +01:00
Dmitriy Zaporozhets
9ab4539a62
Require gitlab-shell v1.7.3
2013-10-31 19:48:39 +02:00
Nigel Kukard
aca7f56fef
Best to escape strings not split them
...
Signed-off-by: Nigel Kukard <nkukard@lbsd.net >
2013-10-31 07:34:11 +00:00
Nigel Kukard
ce75f46bf7
Escape strings
...
Signed-off-by: Nigel Kukard <nkukard@lbsd.net >
2013-10-29 18:06:10 +00:00
Dmitriy Zaporozhets
ee0e9830c1
gitlab-ci service api: clean values instead of destroy
2013-10-29 18:13:51 +02:00
Dmitriy Zaporozhets
d636ad49bf
API: set gitlab-ci service for project
2013-10-29 16:39:46 +02:00
Dmitriy Zaporozhets
4a715c7360
Merge branch 'init_exit_status' of /home/git/repositories/gitlab/gitlabhq
2013-10-28 15:21:39 +00:00
Dmitriy Zaporozhets
235a6182ac
Merge branch 'fix_sidekiq_rake' of /home/git/repositories/gitlab/gitlabhq
2013-10-25 09:32:20 +00:00
Jacob Vosmaer
4727fa3fcc
Report application status through init exit code
2013-10-25 11:26:22 +02:00
Jacob Vosmaer
90086fe2dc
Restore sidekiq rake tasks
2013-10-25 09:39:31 +02:00
Dmitriy Zaporozhets
0542261437
Allow git clone with http for GitLab CI service:
...
If you enable GitLab CI for project you will be able to clone project
source code with next command:
git clone http://gitlab-ci-token:XXXXXXXXXXXX@host:project.git
Requires for GitLab CI 4.0
2013-10-24 17:17:22 +03:00
Rovanion Luckey and GitLab
67a80d07ab
Updated the init script, now waits for pids
2013-10-24 14:56:17 +02:00
Peter Fern
05c988419f
Expand refs constraints to include valid characters
...
Fixes #4831 , #4865 , #4932
2013-10-24 16:31:15 +11:00
Jacob Vosmaer
73d19bb320
Count sidekiq processes using String#scan
...
It seems there is no easy way to count pattern occurences with
String#match.
2013-10-17 12:01:29 +02:00
Dmitriy Zaporozhets
03dba1fd42
Merge pull request #5344 from amacarthur/thread-variable-fix
...
Fixing unsafe use of Thread.current variable :current_user
2013-10-16 23:30:44 -07:00
Nihad Abbasov
12420a2256
refactor by_username_or_id
2013-10-16 22:31:46 +05:00
Nihad Abbasov
e09cc195a7
fix variable name
2013-10-16 22:28:39 +05:00
Marin Jankovski
f3d77a7661
Add invert match to sidekiq match.
2013-10-16 13:39:09 +02:00
Dmitriy Zaporozhets
615d859f94
Merge branch 'logrotate' of /home/git/repositories/gitlab/gitlabhq
2013-10-16 10:08:53 +00:00
Jacob Vosmaer
d378332ff9
Add logrotate setup to the installation guide
2013-10-16 10:38:13 +02:00
Angus MacArthur
aefe2e952f
Fixing unsafe use of Thread.current variable :current_user
2013-10-16 01:20:53 -04:00
Jacob Vosmaer
6a7d63aa47
Move unicorn and sidekiq commands into bash script
2013-10-15 22:48:57 +02:00
Dmitriy Zaporozhets
2e8b0fa5cf
Oauth users and users created by admin should be confirmed immediatly
2013-10-15 09:59:58 +03:00
Dmitriy Zaporozhets
12800e5445
Extend API Issues, MergeRequets, Milestones with iid field
2013-10-14 16:39:54 +03:00
Dmitriy Zaporozhets
1073019d36
Merge branch 'sidekiq_restart' of /home/git/repositories/gitlab/gitlabhq
2013-10-14 07:00:58 +00:00
Marin Jankovski
ad3defa3c2
Skip relative links render in help page.
2013-10-11 21:41:33 +02:00
Dmitriy Zaporozhets
b883d94f96
Merge branch 'relative_links_in_documentation' of /home/git/repositories/gitlab/gitlabhq
2013-10-11 13:00:05 +00:00
Dmitriy Zaporozhets
10fac47527
Merge branch 'wiki_backup' of /home/git/repositories/gitlab/gitlabhq
2013-10-11 09:32:38 +00:00