a3f645ef51
Remove deprecated finders
2014-01-19 23:39:56 +04:00
21bc41c6ee
Add support of base64 encoded content
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-16 18:02:09 +02:00
38d8d749d7
Merge branch 'feature/merge_commit_message' of /home/git/repositories/gitlab/gitlabhq
2014-01-15 10:36:12 +00:00
cc1f7ea2de
Allow . files to be created
...
Fixes: https://github.com/gitlabhq/gitlabhq/issues/5770
2014-01-14 18:26:01 +01:00
d84b0fa6b5
Add merge_commit_message argument for Satellite::MergeAction#merge
2014-01-13 16:49:35 +02:00
6a80083294
Use same code for diff and patch inside MergeAction
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-13 16:16:45 +02:00
7c6287c878
Add support of custom message to merge action of satellite
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-13 13:17:38 +02:00
515ed7755e
Respect default theme settings. Fixed sign-in button on publica page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-10 13:58:52 +02:00
1ad2a93678
Merge pull request #5760 from dermoth/master
...
Fix HTTP push to public repos
2014-01-07 02:47:56 -08:00
7cc2520541
Add support for various archive formats.
...
Used mime-types gem instead of hardcoding content types.
Allow multiple extensions in archive route (.tar.gz, .tar.bz2).
Change content disposition from infile(?) to attachment for api.
Fixed api would return “archive” instead of {project}-{hash}.{ext}
2014-01-02 10:18:56 -06:00
405492e90c
Fixed issue with `bundle exec rake routes` not running.
...
Wrap regex comments in (?#comment) construct.
2013-12-23 20:01:38 -06:00
088f0602b9
Fix upgrader
...
It created branch based on current branch which is an old version
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-23 18:01:51 +02:00
843548cc76
Fix HTTP push to public repos
...
When doing an HTTP push, git (as of v1.7.9) first do an info/refs
request, and only if this request requires authentication it asks the
user for its password and authenticates further requests.
The initial request normally clears without auth on public repos as it
doesn't update any ref. This patch forces every git-receive-pack
requests to provide authentication.
2013-12-16 12:39:54 -05:00
d476ac7d41
Remove colored gem from upgrader script. pt2
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-14 14:11:31 +02:00
5e73a3b124
Remove colored gem from upgrader script
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-14 14:10:24 +02:00
c638ef3348
Use 'ruby script/upgrade.rb -y' instead of ENV
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-13 16:23:58 +02:00
51c9f0fd76
Allow non-interactive run of upgrade script. ruby script/upgrade.rb FORCE=yes
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-13 16:17:54 +02:00
99830bb6f8
Create branch for tag
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-13 15:22:27 +02:00
440f3f384f
Minor version upgrader
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-13 15:18:57 +02:00
49a26eaece
Fix project lookup for git over http + rails4
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:27 +02:00
e44653764a
Merge pull request #5798 from criteo/skip_confirmation
...
Skip email confirmation with LDAP
2013-12-10 01:43:38 -08:00
f1c82bc56c
Add gitlab-shell#path option in config
...
Before this commit gitlab-shell but me placed directly in home dir.
Ex:
/home/git/gitlab-shell
After this change you can place gitlab-shell in custom location.
Ex:
/Users/developer/gitlab/gitlab-shell
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-09 19:32:37 +02:00
2c4e3e001f
Skip email confirmation with LDAP
2013-12-09 11:06:12 +01:00
71e92681f2
We welcome everyone to contribute.
2013-12-01 11:53:00 +01:00
d9bb4230cc
Adding authenticated public mode (internal).
...
Added visibility_level icons to project view (rather than just text).
Added public projects to search results.
Added ability to restrict visibility levels standard users can set.
2013-11-26 22:22:07 -06:00
51ae88c4e4
Improve refs parsing for git over http
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-22 12:55:20 +02:00
06feb3c442
Cleanup parsed refs for git over HTTP
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-22 12:41:55 +02:00
b07c02eb13
Add more info to admin dashboard
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-20 13:41:41 +02:00
182aa19e26
Parse all refs when do push via HTTP and check permissions for all of them
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-20 11:06:19 +02:00
3f3b202c6e
Improve files API. Relative path check added. Create dir for new file if missing
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-20 10:21:45 +02:00
3bab1bd4c1
Improve consistency: use file_path for API create/update/delete files
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-20 10:03:50 +02:00
8a91e5d7d0
Fix DeleteFile satellite action
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-19 16:13:37 +02:00
b26abe8ff8
Delete file action for satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-19 15:41:32 +02:00
60959df3f2
Remove gitolite mention
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-19 15:41:11 +02:00
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
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
0b67606af6
New API: create file in repo
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-07 18:53:09 +02:00
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
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
592d1fabd6
Revert "Escape strings"
...
This reverts commit ce75f46bf7
2013-11-01 16:29:28 +02:00
482a39abb0
Revert "Best to escape strings not split them"
...
This reverts commit aca7f56fef
2013-11-01 16:25:06 +02:00
aca7f56fef
Best to escape strings not split them
...
Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
2013-10-31 07:34:11 +00:00
ce75f46bf7
Escape strings
...
Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
2013-10-29 18:06:10 +00:00
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
05c988419f
Expand refs constraints to include valid characters
...
Fixes #4831 , #4865 , #4932
2013-10-24 16:31:15 +11:00
2e8b0fa5cf
Oauth users and users created by admin should be confirmed immediatly
2013-10-15 09:59:58 +03:00
baa65e89b9
Check if LDAP user was removed or blocked when use git over ssh
2013-10-07 16:06:30 +03:00
a817993439
Remove outdated comments.
2013-10-04 13:26:48 +02:00
fa7d75733c
Fix failed merge when filename is the same as target branchname.
2013-10-04 12:38:49 +02:00
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
skv
Dmitriy Zaporozhets
Jeroen van Baarsen
Jason Hollingsworth
Thomas Guyot-Sionnest
Maxime Brugidou
Sytse Sijbrandij
Elias Mårtenson
Nigel Kukard
Peter Fern
Marin Jankovski
Izaak Alpert