home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
1143 Commits
Author SHA1 Message Date
Jacob Vosmaer 9e86f3b156 Warn that relative URL's are unsupported 2013-07-02 10:27:51 +02:00
Jack Weeden 6a84d92672 Added update and delete_attachment actions to note controller 2013-07-01 10:47:39 +01:00
Dmitriy Zaporozhets 6e550af150 Show shotcut dialog on ? 2013-06-30 22:10:52 +03:00
Dmitriy Zaporozhets 0f84833c33 Remove capistrano files since its very problematic to deploy gitlab with it 2013-06-30 19:19:06 +03:00
Dmitriy Zaporozhets f438bd415f Merge branch 'master' into 6-0-dev 
Conflicts:
	app/controllers/admin/teams/projects_controller.rb
	app/views/team_members/_team_member.html.haml
	app/views/teams/members/_member.html.haml
 2013-06-30 11:35:40 +03:00
Dmitriy Zaporozhets 112e919823 Remove unnecessary namespaced resource 2013-06-26 15:02:28 +03:00
Yves Senn 95353aa6c4 Merge pull request #4419 from jlgeering/master 
whitespaces in gitlab.yml.example
 2013-06-25 22:55:13 -07:00
Jean-Luc Geering 01d694aaba whitespaces in gitlab.yml.example 2013-06-25 14:01:41 +03:00
Dmitriy Zaporozhets 3e09e6f7b8 Move Profile related controllers under Profiles:: module 2013-06-24 18:24:14 +03:00
Dmitriy Zaporozhets 2ed7cbfba4 Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00
Dmitriy Zaporozhets 96f3a88c01 Restrict auto generated routes 2013-06-22 15:11:23 +03:00
Dmitriy Zaporozhets ee13297af2 Cleanup: removed unused routing/methods. Improved admin area usability 2013-06-22 14:11:20 +03:00
Dmitriy Zaporozhets 439f399bec Remove all team resources except models. Move models to deprecated directory 2013-06-18 21:22:34 +03:00
Dmitriy Zaporozhets e12c9ee2bc Added UsersGroup scaffold. Simplify adding people to group 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets 5b40780290 Password expire: implement password resource inside profile. add before_fiter check 2013-06-13 19:53:04 +03:00
Dmitriy Zaporozhets 2c3ddacbd7 Disable threadsafe! for rake tasks 2013-06-13 09:58:03 +03:00
Dmitriy Zaporozhets 993af5d0d2 cattr_accessor is not threadsafe! 2013-06-11 18:15:18 +03:00
Dmitriy Zaporozhets 5511a731bc Enable threadsafe. Preload lib/ 2013-06-11 18:03:13 +03:00
Dmitriy Zaporozhets 9ae26cd128 Merge pull request #4257 from jojosch/fix/routing-commit-with-# 
Routing fix Commit-List: branch with # and + in name
 2013-06-11 01:03:03 -07:00
Dmitriy Zaporozhets 038d40f0f5 Solve inconsistency between network graph & stat graphs 2013-06-11 09:54:01 +03:00
Johannes Schleifenbaum c830bab79a Commit List and Tree allow also + in branch name 2013-06-09 23:47:55 +02:00
Johannes Schleifenbaum 37ff9d88ec Routing fix Commit-List: switch to branch with # in name 2013-06-09 16:28:55 +02:00
Daniel Salmerón AmselemandDmitriy Zaporozhets 64c37a21c8 Fix typo in smtp_settings.rb.sample 2013-06-07 16:59:53 +03:00
Dmitriy Zaporozhets 68d146b4a6 Improve api docs 2013-06-06 13:19:23 +03:00
Karlo Sorianoandkarlo57 71d67e6557 Contributors graphs feature for GitLab 
Created tests and refactored some code along the way

Added stat graph util spec, refactored code

finsihed up tests and refactors

finsihed up tests and refactors
 2013-06-05 16:51:48 +08:00
Dmitriy Zaporozhets bcc4e4dc7e Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist 
Conflicts:
	Gemfile.lock
	app/models/ability.rb
	app/models/project.rb
	app/views/snippets/_form.html.haml
	db/schema.rb
	features/steps/shared/paths.rb
	spec/factories.rb
	spec/models/project_spec.rb
 2013-06-04 18:36:22 +03:00
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 GuridiandPedro 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