a7aacb4dc4
Merge pull request #6586 from abner/master
...
added api method to return labels of a given project
2014-03-25 19:39:16 +02:00
306d4ee728
Merge pull request #5935 from nmoura/patch-1
...
Changed sudo by su -c in init script
2014-03-25 15:06:54 +01:00
8af94ed755
Add gzip compression for assets to nginx example.
2014-03-24 14:59:09 +01:00
e153469f31
changed doc comment for get labels of a project
2014-03-23 19:07:18 -03:00
cc575875b6
Merge branch 'master' of https://github.com/gitlabhq/gitlabhq
2014-03-22 16:43:09 -03:00
760f827ba0
Remove code that does nothing
...
ping @karlhungus
2014-03-22 15:40:42 -04:00
fa34059574
Default message for SatelliteNotExistError
2014-03-22 15:36:54 -04:00
ae1a314824
Fix upgrader
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-21 23:08:36 +02:00
5c038d949f
Fix gitlab-ci integration
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-21 23:04:57 +02:00
7dd18a3ec8
Fix http clone for public project
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-21 14:52:30 +02:00
895c913247
Use the latest tag, 1.9.1 for gitlab-shell.
2014-03-21 12:42:59 +01:00
44aa6b90dd
added api method to return labels of a given project
2014-03-21 06:25:25 -03:00
5f595be4b8
Use new gems methods.
2014-03-20 13:33:16 +01:00
e013be10d7
GitLab requires gitlab-shell v1.9.0
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-20 13:37:35 +02:00
83e83b6617
Improve grack auth
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-20 10:53:03 +02:00
729b358ff2
push via http now served via /allowed API
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-20 10:16:17 +02:00
f18a714f35
Use GitAccess in internal api
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-20 10:16:17 +02:00
19c28822ef
Add Gitlab::GitAccess class to resolve auth issues during pull/push
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-20 10:16:17 +02:00
9886998f24
Add method to get the comments on a merge request
...
Add method to get the comments for a merge request and
document that you can change the status of a merge request.
2014-03-19 19:07:51 +01:00
acaf297846
Merge pull request #5993 from DarkHorseComics/bypass-commented-sqlite
...
Explain what to do about legacy sqlite in database.yml
2014-03-18 10:48:27 +01:00
8fa53ce43d
Merge branch 'check_orphaned_users_groups' into 'master'
...
Check Orphaned Users Groups
2014-03-18 07:14:08 +00:00
37192d5e18
Add more descriptive line for resolving sqlite error during check
2014-03-17 09:43:27 -07:00
493c7a6147
Merge branch 'links_within_same_repo' into 'master'
...
Relative links within one system
When using relative links in md in repository file it will only link within the repository.
When using relative links in md in wiki page, it will only link to wiki pages.
2014-03-17 14:06:08 +00:00
5e7e814e81
Drop UsersGroup orphans using `rails runner`
2014-03-17 14:42:20 +01:00
c02e3d441b
Fix tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-17 15:29:45 +02:00
928b7f3bff
Add tests for API project permissions info
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-17 15:14:27 +02:00
0ea0e542a9
Remove old entities
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-17 14:35:50 +02:00
eea317795e
Add current user permissions info to /api/projects/:id.json
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-17 14:33:41 +02:00
f04d5bfaf6
Wiki will show relative links related to the wiki gollum repository.
2014-03-17 13:06:19 +01:00
7c60713e82
Move project members api to separate file
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-17 13:44:54 +02:00
a7ac57a1a3
Merge pull request #6534 from dlorch/master
...
JIRA project identifiers may also contain dashes '-'
2014-03-17 13:28:39 +02:00
fddbd7b2f0
Merge branch 'issue-110' of https://gitlab.com/gmessner/gitlab-ce into gmessner/gitlab-ce-issue-110
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
2014-03-16 09:43:25 +02:00
39f80884db
Improve developer seeds
...
Return execution of observers in seeds.
Mute email sending to letter opening in you browser.
Added `rake dev` task to reset db and add seeds.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-15 11:39:35 +02:00
ecae936d34
Merge branch 'batch_key_import' into 'master'
...
Batch Key Import
2014-03-15 06:28:44 +00:00
686128cd68
JIRA project identifiers may also contain dashes '-'
2014-03-14 18:08:05 +01:00
4aa3ce7534
Add check for orphaned UsersGroups
2014-03-14 17:25:11 +01:00
090ed21e6f
Batch key import requires gitlab-shell 1.8.5
2014-03-14 15:58:47 +01:00
779fa4a7b7
Use batch_add_keys in `rake gitlab 🐚 setup`
2014-03-14 15:49:11 +01:00
a9f2903e86
Change project lookup order for api
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14 15:58:52 +02:00
fa3c087a4c
Clear rake task only if defined
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14 14:23:28 +02:00
1ec106b853
Merge branch 'ldap_connections'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
2014-03-14 12:58:43 +02:00
bce8edbbcc
Require gitlab-shell v1.8.4
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14 12:57:26 +02:00
b007cadf55
Fix project creation test
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14 12:19:02 +02:00
8839339ee3
Override rake test
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14 11:06:10 +02:00
f6f80659ec
Override rake spec and rake spinach tasks
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14 10:44:16 +02:00
56df3dbff2
Add Gitlab::LDAP::Access.open
...
This new method wraps Gitlab::LDAP::Adapter.open to enable connection
reuse.
2014-03-14 08:55:50 +01:00
af53aa9072
Add Gitlab::LDAP::Adapter.open
...
This new method is based on Net::LDAP.open, which reuses a single LDAP
connection.
2014-03-14 08:53:46 +01:00
5a616649b5
Allow passing an adapter to Gitlab::LDAP::Person
2014-03-14 08:52:57 +01:00
6f5a9b4110
Merge pull request #6360 from jvanbaarsen/fix-6328-expose-username
...
Also expose username for the /discover endpoint
2014-03-13 22:40:01 +02:00
3082d2a4be
Merge branch 'tighten_logrotate' into 'master'
...
Tighten Logrotate
2014-03-13 20:07:57 +00:00
b0a86cb3ba
Use gitlab:setup inside gitlab:test
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-13 11:33:33 +02:00
46cc3b22c9
Add mysql limits to db during setup
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-13 10:47:53 +02:00
c22646d2a4
Logrotate daily, keeping 90 days of old logs
...
Also remove the 'delaycompress' option which is not needed because we
use 'copytruncate'.
2014-03-12 15:26:39 +01:00
f9c4bb5638
Changed limits to a higher order
2014-03-12 08:13:27 +01:00
71b1030bf7
Added rake task to add limits back in mysql
2014-03-11 19:23:02 +01:00
f16de8ac8c
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-03-11 11:29:18 +02:00
767f7d9ae7
Merge branch 'ldap-code' into 'master'
...
LDAP code from EE
2014-03-11 09:28:41 +00:00
ae68a66a98
Merge pull request #6478 from infoMantisGmbH/master
...
Allow underscore as the first char for project names.
2014-03-11 10:13:52 +02:00
92a928468f
Merge branch 'catch_missing_command' into 'master'
...
Catch missing commands in Rake tasks
2014-03-10 18:48:31 +00:00
ad71eca8bb
Catch missing commands in rake tasks with ''
2014-03-10 18:14:59 +01:00
0aa389b491
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-03-10 17:34:09 +02:00
ea432f6032
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2014-03-10 17:33:57 +02:00
dca8f6d4a6
Merge pull request #6492 from tsigo/gitlab-shell-custom-path
...
Respect custom gitlab_shell path in gitlab:gitlab_shell:check task
2014-03-10 17:30:21 +02:00
b1ff8e31b1
Add ldap check in application_controller and internal api
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-10 17:10:23 +02:00
0fdab6a747
Remove copyright
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-10 17:09:45 +02:00
daa7f077db
Port LDAP code from EE
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-10 14:48:08 +02:00
6bf5215b23
Some people are getting the error 'The remote end hung up unexpectedly' due to large chuncks.
2014-03-10 09:11:19 +01:00
058aae5940
Fixed Unicorn-Sidekiq confusion in GitLab init script.
...
There were a few places in the included init script where
Unicorn was referred to as Sidekiq and vice-versa.
This fixes #126 .
2014-03-08 09:07:59 -05:00
c5f76e5939
Popen (at least on OSX) expects an Array, not a String
...
This was causing the gitlab:check task to exit prematurely with the
error "System commands must be given as an array of strings."
2014-03-07 21:39:48 -05:00
30f8713aa1
Respect custom gitlab_shell path in gitlab:gitlab_shell:check task
...
Prior to this change, if I customized the config value of
`gitlab.gitlab_shell.path`, the check would ignore this value in favor
of `"~<gitlab.gitlab_shell.ssh_user>/gitlab-shell/"` resulting in a
failed check when the configuration was otherwise valid.
2014-03-07 21:05:56 -05:00
61a72bc2e2
Allow underscore as the first char for project names.
...
Not sure if the default_regex really has to be expanded for this special use case. We tried to extend only the project_name_regex first, but that didn't help.
2014-03-06 14:08:40 +01:00
f1d8efb770
Merge branch 'shell_new_style' into 'master'
...
Use new style shell commands
2014-03-05 10:45:46 +00:00
7e14f86c71
Added description parameter support to Create and Update MR API endpoints (issue-110).
2014-03-03 23:08:39 -08:00
affc37ad02
change deploy.sh without mysql, now that we are moving to postgres
2014-03-04 00:10:49 +00:00
d6b0ac96f7
Invoke Kernel#system with separate arguments
2014-03-03 08:40:30 +01:00
2b816075dc
Replace backticks with Gitlab::Popen
2014-03-03 08:40:29 +01:00
54e40241f6
Merge branch 'backup_uploads_symlink' into 'master'
...
Backup Uploads Symlink
2014-03-01 12:55:13 +00:00
75f274b750
Use Gitlab::VERSION to version backups
...
Previous to this commit, backups were tied to the git revision (SHA1) of
the app at the time the backup:create command was invoked. If the SHA1
at the time of restore was different, the script would refuse to restore
the backup. This commit loosens this tie so that the backup script only
complains if the value of the Gitlab::VERSION constant is different
between the time of backup and the time of restore.
2014-02-27 14:30:41 +01:00
0a963ee15a
Merge branch 'pg_force_restore' into 'master'
...
Pg Force Restore
2014-02-27 12:27:30 +00:00
981deddfce
Merge branch 'highlight_html_escape' into 'master'
...
Enable html_escape for code blocks highlighted in markdown
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/94
2014-02-27 11:13:46 +00:00
c94dc3de78
html_escape is private for rails 4.0.2 :(
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-27 11:12:12 +02:00
4d896a2b86
Enable html_escape for code blocks highlighted in markdown
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-27 09:38:11 +02:00
b155a44ef4
Merge branch 'backup_restore_hooks_bug' into 'master'
...
Fix backup/restore git hooks bug
2014-02-26 20:54:23 +00:00
8fe10e642a
Empty the database during Postgres backup restore
...
The expected behavior during a GitLab backup restore is to overwrite
existing database data. This works for MySQL because the output of
mysqldump contains 'DROP TABLE IF EXISTS' statements. pg_dump on the
other hand assumes that one will restore into an empty database. When
this is not the case, during the restore with psql some of the data will
be skipped if existing data is 'in the way'. By first invoking `rake
db:schema:load` during a Postgres GitLab backup restore, we make sure
that all important data is correctly restored.
2014-02-26 18:26:31 +01:00
91c70c5b1c
Use gitlab_shell.path to invoke rewrite-hooks.sh
...
The backup restore code for repositories was assuming that gitlab-shell
is installed in /home/git/gitlab-shell. This commit changes that to use
the configuration setting from gitlab.yml that specifies the path where
gitlab-shell is installed.
2014-02-26 17:32:52 +01:00
a47a6f2afd
Support symlinked public/uploads for backp restore
...
The backup restore code moves any existing uploads directory out of the
way before restoring the copy from the backup. If public/uploads was a
symlink, this move would replace the symlink. This commit avoids this
issue by first resolving any symlinks in the uploads path.
2014-02-26 17:26:48 +01:00
36c2c354fc
Adapt use of Gitlab::Popen to new style
2014-02-25 12:00:33 +01:00
38f4b61a58
Make it possible to call Gitlab::Popen.popen
2014-02-25 11:58:58 +01:00
8016cefafe
Make the Gitlab::Popen path argument optional
2014-02-25 11:58:22 +01:00
0432bdf19e
Change Gitlab::Popen to use arrays for commands
2014-02-25 11:57:42 +01:00
e800fe0e50
Fix extra space added in beginning of commit message
...
Removes extra space in merge commit messages. This seems to have been
introduced by the functionality added in 38d8d749d
2014-02-24 20:53:57 -05:00
c2ed468d80
Also expose username for the /discover endpoint
...
Fixes #6328
2014-02-20 10:59:03 +01:00
91e7692b66
Fix searching by extern_uid for LDAP to be case-insensitive
2014-02-18 19:38:22 +01:00
1c61ac1c64
Refactor MR code reload
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 20:17:26 +02:00
8686d09d3e
Merge branch 'feature/api_fle_encoded' into 'master'
...
Complete api files CRUD
Adds ability to read file from repository with content encoded with Base64.
2014-02-18 14:15:40 +00:00
6cf39fe10d
Extract commits API to separate file
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 12:41:21 +02:00
ddbe978041
Complete api files CRUD
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 12:27:02 +02:00
3c742dad27
Fixed bug with json files content being escaped in api
...
After update to recent grape env['api.format'] does not work any more.
Use content_type for rendering raw json files content
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 11:40:45 +02:00
0744eac9c6
Merge pull request #6189 from jcockhren/api_ldap_check_for_user
...
the existence of former ldap users doesn't imply LDAP is enabled.
2014-02-17 09:26:10 +02:00
f0f88390c1
project_user selectbox with ajax autocomplete
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-13 16:08:26 +02:00
1d48904ac8
Show avatars in ajax user selectbox
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-13 15:45:24 +02:00
168e0341a3
Merge pull request #5520 from gabetax/rake_group_bulk_add_permissions
...
add rake gitlab:import: all_users_to_all_groups and user_to_groups
2014-02-12 09:40:40 +02:00
61748c993d
Headers have ids and link to their own id.
2014-02-11 16:23:33 +01:00
da34e008c3
Merge pull request #5294 from dalehamel/master
...
Ensure directory exists before changing in popen
2014-02-04 07:21:35 -08:00
98fe8fb98d
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-02-04 16:18:40 +02:00
97a4d8aea4
Improve code according to new gitlab_git
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-04 14:46:15 +02:00
7085892e47
remove remaining python references
2014-02-03 11:25:47 +01:00
9e181d36ea
Dont check for python any more
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-31 13:09:10 +02:00
e2e900a338
In the case when a user can and has authenticated with ldap, however
...
ldap is disabled in the gitlab config, this fixes the API still calling
the ldap backend.
2014-01-28 15:10:36 -06:00
5de16dee76
Add a custom 502 page
2014-01-28 10:19:22 +01:00
b6454591cc
Merge branch 'highlight-js' into 'master'
...
Highlight.Js
Replace pygments code highlight with client-side library - highlight.js
http://highlightjs.org/
2014-01-28 07:58:59 +00:00
891ea6f6e6
Improve highlight for notes
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-27 18:18:18 +02:00
c3ae30b60e
Merge branch 'upload-limits' into 'master'
...
Upload Limits
Better documentation for the upload limit. Please have a hard time when they need to change the upload limits, see https://gitlab.com/gitlab-org/gitlab-ce/issues/5
2014-01-27 12:44:14 +00:00
78b2fb5de9
Add highlight.js support to markdown, snippets etc
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-27 13:12:58 +02:00
abae128915
Use either/or to present options
2014-01-27 11:59:15 +01:00
7b32be6eb1
Explain what we know about Nginx chunked requests
2014-01-27 11:19:45 +01:00
5221dbfee7
Merge branch 'fix/routing' of /mnt/ebs/repositories/jhworth.developer/gitlab-ce
2014-01-27 07:57:36 +00:00
17f7da3d97
improve upgrader "latest version" message
2014-01-25 23:33:55 +00:00
71c157e43b
Add files to path blacklist.
...
Remove empty ErrorsController
2014-01-24 20:06:44 -06:00
d1d138562a
Merge branch 'report_backup_db_success' into 'master'
...
Report success/failure of DB backup commands
2014-01-24 11:27:48 +00:00
42220f2a18
Remove version since we don't keep it up to date.
2014-01-23 15:14:07 +01:00
28e13634dc
Merge branch 'improve/mr_diff'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
features/steps/project/project_fork.rb
features/steps/project/project_forked_merge_requests.rb
features/steps/project/project_issue_tracker.rb
features/steps/project/project_markdown_render.rb
features/steps/shared/project.rb
2014-01-23 14:38:23 +02:00
9e6fc8b526
Report failure of DB backup commands
2014-01-23 11:19:43 +01:00
4d56c359d3
Merge pull request #6075 from skv-headless/remove_deprecated_finders
...
Remove deprecated finders
2014-01-22 11:04:56 -08:00
4b3afe2325
Always create merge_request_diff if MR created
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-22 20:22:20 +02:00
7ad70a56d3
Git over ssh and http are different things.
2014-01-22 17:51:00 +01:00
119c782e0b
More explanation for upload limits.
2014-01-22 17:01:47 +01:00
2f4d0a3008
Rephrase LDAP check script output
...
The previous phrasing lead some people to believe that there is a limit
on the number of LDAP users that can sign in to a GitLab instance. That
is not the case; the limit in the check script only applies to the
diagnostic information result set, so that running `rake gitlab:check`
does not output thousands of LDAP users.
2014-01-21 11:05:03 +01:00
2ddfa882c0
Better wording of the import instructions.
2014-01-20 10:44:40 +01:00
bb9e01cba6
Merge branch 'init.d' of /mnt/ebs/repositories/arifali1/gitlab-ce
2014-01-20 07:20:07 +00:00
a3f645ef51
Remove deprecated finders
2014-01-19 23:39:56 +04:00
f8aae4b7d8
Merge branch 'add_website_url_to_user' of https://github.com/jeromedalbert/gitlabhq into jeromedalbert-add_website_url_to_user
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
2014-01-19 20:23:29 +02:00
2e3f250d45
Add website url to user
2014-01-18 19:15:10 +00:00
4d7792bc38
Merge branch 'explain_ldap_check' into 'master'
...
Improve the explanation of the LDAP check script
2014-01-17 14:14:05 +00:00
f0d2d28118
Merge branch 'refactoring/context_into_services' into 'master'
...
Refactoring context Into services
To prevent confusion where to write logic. Context or Service?
2014-01-17 09:47:47 +00:00
efa10c819d
Replace context with service in lib
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-16 20:35:21 +02:00
af9a14c49c
Explain that `limit` only applies to the check
2014-01-16 18:40:45 +01:00
4f2e9fb8e5
Accept encoding attribute in files API
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-16 18:11:00 +02: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
f19cdee8cc
Remove commit_load_context.rb
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-15 15:06:12 +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
ef404d8ea6
Dropped expiration date from the snippet API
2014-01-11 18:40:17 +01: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
4650855685
Update the init.d file to the correct locationof the example defaults file
...
Update the example defaults, include the rest of he variables
2014-01-08 22:54:03 +00:00
1ad2a93678
Merge pull request #5760 from dermoth/master
...
Fix HTTP push to public repos
2014-01-07 02:47:56 -08:00
6579de0727
Merge pull request #5799 from criteo/import_url_api
...
Add import_url param in API projects create
2014-01-06 06:18:26 -08:00
1c0929f5ac
Merge pull request #5823 from bobot/feature/api_parent_ids
...
[API] add parent_ids to specific commit informations
2014-01-06 06:15:48 -08:00
d25b5d029d
Merge pull request #5891 from jhollingsworth/feature/zip-archive
...
Add support for various archive formats.
2014-01-04 12:45:48 -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
60e451fde4
Change canonical urls to GitLab Cloud.
2013-12-30 14:27:18 +01:00
6daa97f472
Changed sudo by su -c
...
The sudo command needs a tty to run. If you put this file on a CentOS 6, for example, it will not run in the host startup process. Instead, the 'su -c' runs the command apart if it has or not a tty.
I tested this change in a fresh install of gitlab on a CentOS 6.5 with successful.
2013-12-26 17:13:25 -02:00
27912f9c21
Add api support for raw blob search
...
See issue
http://feedback.gitlab.com/forums/176466-general/suggestions/4566001-expose-raw-object-search-via-the-gitlab-api
2013-12-26 08:54:13 -05: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
f24e151414
Merge pull request #5617 from zeeZ/nginx-proxy
...
Add X-Forwarded-For to nginx config
2013-12-16 03:54:04 -08:00
d46dba5830
Merge pull request #5847 from skv-headless/fix_deprecation_warnings
...
fix most of warnings
2013-12-16 03:22:55 -08:00
d89527839e
fix most of warnings
2013-12-15 00:05:10 +04: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
2934e7a962
Update deploy.sh script with assets commands
2013-12-11 14:34:10 +00:00
7b3b63d4d4
[API] add parent_ids to specific commit informations
2013-12-11 14:41:07 +01:00
3ad6c61241
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2013-12-11 09:19:36 +02:00
427e68ecbe
Merge pull request #5801 from Rovanion/default-doc
...
Added example defaults file and appropriate documentation.
2013-12-10 04:09:50 -08: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
29cb573b6c
Added example defaults file and appropriate documentation.
2013-12-09 14:05:50 +01:00
56d4788264
Add import_url param in API projects create
2013-12-09 11:07:32 +01:00
2c4e3e001f
Skip email confirmation with LDAP
2013-12-09 11:06:12 +01:00
31cdb7a405
Merge pull request #5471 from dex4er/feature_etc_default_gitlab
...
Read configuration variable file (/etc/default/gitlab) if it is present
2013-12-09 00:29:18 -08:00
23d180f5f1
Merge branch 'ldap_check' of /home/git/repositories/gitlab/gitlabhq
2013-12-04 14:56:19 +00:00
21f4e5d3ac
ProjectHook API supports new event fields
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-04 13:37:39 +02:00
882029d9c6
Expose ProjectHook attributes via API
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-04 13:37:39 +02:00
80302a0f6f
Limit the number of results in gitlab:ldap:check
2013-12-03 18:51:21 +01:00
aa69e29e70
Merge pull request #5610 from demosdemon/patch-1
...
Add client_max_body_size to nginx site
2013-12-02 23:29:11 -08:00
71e92681f2
We welcome everyone to contribute.
2013-12-01 11:53:00 +01:00
73dde832c4
Merge branch 'auto_disable_color' of /home/git/repositories/gitlab/gitlabhq
2013-11-28 17:24:36 +00:00
376cfc6ac6
Give more information in rake gitlab:ldap:check
2013-11-28 18:12:30 +01:00
9f4909faad
Add LDAP check to rake gitlab:check
2013-11-28 15:20:40 +01:00
562a461c56
Disable rake color output unless connected to TTY
2013-11-27 10:09:46 +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
7e4739fe22
Merge branch 'backup_commands' of /home/git/repositories/gitlab/gitlabhq
2013-11-21 07:45:37 +00: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
7101b22c2e
Recommend gitlab-shell 1.7.9 in docs and check task
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-20 12:34:14 +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
32d7332d2c
API: delete file from repository
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-19 16:33:38 +02:00
8a91e5d7d0
Fix DeleteFile satellite action
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-19 16:13:37 +02:00
Dmitriy Zaporozhets
Jacob Vosmaer
Marin Jankovski
Ábner Silva de Oliveira
Robert Speicher
Stuart Pook
Jamey J. DeOrio
Daniel Lorch
Jeroen van Baarsen
dosire
Kyle Fazzari
mk
Greg Messner
Arif Ali
awiddersheim
Jakub Jirutka
Ciro Santillli
Johannes Schleifenbaum
Jurnell Cockhren
Corobi
Jason Hollingsworth
skv
Jerome Dalbert
Nilton Moura
Thom Gerdes
Thomas Guyot-Sionnest
François Bobot
Rovanion Luckey
Maxime Brugidou
Sytse Sijbrandij