Dmitriy Zaporozhets
a52936f36a
Renames resque resource to background_jobs
2013-05-30 09:46:28 +03:00
Dmitriy Zaporozhets
c698bc7d9e
Merge pull request #4037 from mitchty/master
...
Remove user directory path assumptions
2013-05-29 23:28:17 -07:00
Pedro Guridi and Pedro Guridi
5ec3129ea6
Changed regex to support Jira issue numbering format
...
Jira issues numbering format are like: "PROJECT-1234".
Changed the regular expression to support Jira issues linking, in addition to the normal #123 .
Added Jira Issue tracker configuration example
2013-05-27 16:51:37 -03:00
Dmitriy Zaporozhets
ec1055076c
Merge branch 'add-defaults-create-group-team' of https://github.com/dmedvinsky/gitlabhq into dmedvinsky-add-defaults-create-group-team
...
Conflicts:
config/gitlab.yml.example
2013-05-27 15:17:06 +03:00
Dmitriy Zaporozhets
a3645b5b4d
Restyle login page for LDAP/regular login
2013-05-24 19:43:47 +03:00
Mitch Tishmack
719f72315f
Apparently the gitlab Travis install has no git user.
...
Hackily handle this with a begin block and return a default that matches current use.
2013-05-23 12:52:38 -05:00
ash
e444c7f6ba
Generate the Rails secret token on first run.
...
Store the secret token in a .gitignored file called ".secret", which is
created by the initializer if it doesn't exist.
2013-05-22 23:55:48 +00:00
Mitch Tishmack
2c947647be
Add a new Settings.gitlab value "user_home".
...
Instead of assuming that the Settings.gitlab['user'] home directory is:
/home/git
Obtain the default value from Etc and use that if not set in config.yml.
2013-05-22 13:51:08 -05:00
Dmitry Medvinsky
22279bc558
Add settings for user permission defaults
...
“Can create groups” and “Can create teams” had hardcoded defaults to
`true`. Sometimes it is desirable to prohibit these for newly created
users by default.
2013-05-16 18:02:22 +04:00
Dmitriy Zaporozhets
9e0246684d
Files controller handle redirect to remote storage. Added config block to carrierwave init
2013-05-15 22:35:59 +03:00
Dmitriy Zaporozhets
9a94f5eb73
Enable HAML ugly mode by default for all environments
2013-05-14 22:17:46 +03:00
Dmitriy Zaporozhets
634cbd7138
Refactor API classes. So api classes like Gitlab::Issues become API::Issues
2013-05-14 15:33:31 +03:00
Lyle Entwistle
85e784cc1d
Fixed puma.rb environment setting, no need to specify 'production' in daemon options now
2013-05-09 17:41:00 +01:00
Dmitriy Zaporozhets
6d204544a1
Merge pull request #3687 from hiroponz/fix-not-using-git-bin-path
...
Fix not using git.bin_path in config.
2013-05-08 11:17:48 -07:00
Dmitriy Zaporozhets
aee110e20d
Add extra config for some advanced customization
2013-05-08 21:03:14 +03:00
Dmitriy Zaporozhets
8688789353
Merge pull request #3834 from ichord/gfm-autocomp
...
improve gfm autocomplete
2013-05-08 04:18:16 -07:00
Michael Härtl
28ef0fe751
Fixes #3793 : Puma configuration for relative base URL
2013-05-08 08:09:23 +02:00
Dmitriy Zaporozhets
9d66875069
Add generate action to labels controller which allow creation of default labels set for project
2013-05-07 17:57:29 +03:00
Dmitriy Zaporozhets
af5d0e9e92
Merge pull request #3275 from Undev/feature/code_cleanup_remove_old_hashes
...
Code cleanup: Replace old hashes and remove trailing spaces
2013-05-07 06:59:03 -07:00
Sato Hiroyuki
9214962d24
Fix not using git.bin_path in config.
...
Closing #3614 " and "Closing #3574 .
2013-05-07 17:20:36 +09:00
Dennis Boldt
f64874c1f5
Fixed forgotten unicorn to puma in a comment.
2013-05-06 16:52:47 +02:00
Dmitriy Zaporozhets
1882baa1aa
Feature: Deploy keys between projects
2013-05-06 15:10:55 +03:00
Andrey Kumanyaev
67ccc8b52a
Replace old hashes with new 1.9 ruby hashes (rebase)
2013-05-05 18:01:10 +04:00
Dmitriy Zaporozhets
493b5ff011
Add smtp_settings sample
2013-05-05 12:48:32 +03:00
ichord
439cd3ebd3
autocomplete issues and preload autocomplete data.
...
update jquery-atwho-rails to v0.3.0
add autocomplete_source action to project for gfm autocomplete
move init_autocomplete layout from head_panel to project_resource
2013-05-04 11:26:43 +08:00
Dmitriy Zaporozhets
f40d4e6685
Merge pull request #3597 from amacarthur/fork-pull-request
...
updated fork feature to use gitlab-shell for v5 of gitlab
2013-05-02 23:41:07 -07:00
Dmitriy Zaporozhets
23ee8e6257
Init aws support for file storage
2013-05-01 12:41:37 +03:00
Dmitriy Zaporozhets
ca281483b3
Update gitlab_git to 1.0.3
2013-04-28 21:27:49 +03:00
Dmitriy Zaporozhets
4f2d2c90f7
Move Gitlab::Git out of gitlab core
2013-04-27 23:50:17 +03:00
Andrew8xx8
f5b549af25
Wall and snippets were disabled by default
2013-04-26 12:02:00 +04:00
Andrew8xx8
d51618b9a1
New settings added to enable or disable project features by default
...
Conflicts:
config/gitlab.yml.example
config/initializers/1_settings.rb
2013-04-24 15:57:08 +04:00
Dmitriy Zaporozhets
3ba36df6c4
remove unicorn config since we use puma now
2013-04-19 17:22:55 +03:00
Axilleas Pipinellis
f95f1bb338
Fixed typo s/insues/issues
2013-04-15 19:36:00 +03:00
Angus MacArthur
ae33fdf297
updated fork feature to use gitlab-shell for v5 of gitlab
2013-04-15 01:54:52 -04:00
Dmitriy Zaporozhets
c351b8a3e5
remove yaml_db gem, Replace team members index route with team_index
2013-04-11 09:39:49 +03:00
Dmitriy Zaporozhets
0f2798d498
Merge branch 'feature/refactoring_scopes_pr' of https://github.com/Undev/gitlabhq into Undev-feature/refactoring_scopes_pr
...
Conflicts:
db/schema.rb
2013-04-09 20:37:04 +03:00
Dmitriy Zaporozhets
e0df75de3f
refactor Issues.js. Remove unused actions. Respect filters while searching for issue
2013-04-07 13:19:36 +03:00
Dmitriy Zaporozhets
1fe61284af
Replace unicorn with Puma
2013-04-04 23:19:24 +03:00
Dmitriy Zaporozhets
94390fc7b4
Proper routing. blobs for blobs, raw for send_data
2013-04-03 09:26:38 +03:00
Andrey Kumanyaev
734d6fcdf0
Perfomance updating Project activity sort
2013-04-03 06:21:04 +04:00
Dmitriy Zaporozhets
c918000bc2
Merge pull request #3396 from Andrew8xx8/issue-button-fix
...
New issue button was not follows to external tracker if it is selected. ...
2013-03-30 15:10:08 -07:00
Dmitriy Zaporozhets
d55ade1686
notification scaffold
2013-03-27 19:04:29 +02:00
Andrew8xx8
242f6aa218
New issue button was not follows to external tracker if it is selected. fixed #3386
2013-03-26 12:28:26 +04:00
Dmitriy Zaporozhets
9d92433a7c
login with both email or username
2013-03-25 16:10:14 +02:00
Dmitriy Zaporozhets
d0df8a6ff8
remove project edit from admin area. Redesigned project page in admin area
2013-03-25 11:07:11 +02:00
Dmitriy Zaporozhets
e292d7c17b
Make transfer action in project controller
2013-03-25 10:48:30 +02:00
Dmitriy Zaporozhets
5f159d4bc0
Merge pull request #3335 from zzet/patch-4
...
Update databases.md
2013-03-24 03:44:14 -07:00
Andrew Kumanyaev
4cc27fd9e1
Update database.yml.postgresql
2013-03-24 14:10:32 +04:00
Dmitriy Zaporozhets
29b0ac489b
move edit to separate controller. This fixes #3265
2013-03-24 11:57:44 +02:00
Dmitriy Zaporozhets
0103363191
replace Gitolited mixin with Gitlab::ShellAdapter
2013-03-21 21:01:14 +02:00