home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
5,645 Commits 48 Branches 340 Tags
d2d566b162b60a2d310dfcdbcd0963c2156dd5ae
Commit Graph
5645 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets d2d566b162 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-07-10 13:49:29 +03:00
Dmitriy Zaporozhets 8dd6af1466 Sanitize user attrs on model level 2013-07-10 13:48:50 +03:00
Yves Senn a8b544ed77 Merge pull request #4519 from kwongius/team-assignment-text 
Fix header text for setting greatest team access to a project
 2013-07-09 11:21:18 -07:00
Kevin Wong 1da67c2cec Fix header text for setting greatest team access to a project 2013-07-09 10:42:35 -06:00
Dmitriy Zaporozhets e1ac3db927 Merge branch 'change-to-default-installer' of /home/git/repositories/gitlab/gitlabhq 2013-07-08 17:36:21 +00:00
Sytse Sijbrandij de680eb8c0 Use default system editor. 2013-07-08 18:52:10 +02:00
Dmitriy Zaporozhets 7ebbb6e33f Added new entries to changelog. Version up to 5.4.0.pre 2013-07-08 13:59:56 +03:00
Dmitriy Zaporozhets 9ee86156db Merge pull request #4508 from Razer6/fix_broken_api_links 
Fix broken API links, fixes #4463
 2013-07-08 03:22:12 -07:00
Dmitriy Zaporozhets 6f5f5e7ee3 Add suppoort of unicorn and fog gems 2013-07-08 09:47:31 +03:00
Dmitriy Zaporozhets cefd8fe2fa Merge branch 'rename-support-forum-to-mailing-list' of /home/git/repositories/gitlab/gitlabhq 2013-07-08 06:29:14 +00:00
Dmitriy Zaporozhets e72900d8e3 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-07-08 00:22:21 +03:00
Yves Senn c04e973327 Merge pull request #4509 from bbodenmiller/cont-updates 
minor contributing guide updates
 2013-07-07 04:49:28 -07:00
Ben Bodenmiller b686b4b962 minor contributing guide updates 
* issues & pr in English
* appropriate language
* typo & format fix
* not catch all pull request
* update changelog
 2013-07-07 04:46:37 -07:00
Robert Schilling 4de11c2009 Fix broken API links, fixes #4463 2013-07-07 12:35:37 +02:00
Sytse Sijbrandij c64ee6ac33 Rename support forum to mailing list to prevent duplication on community page of GitLab.org. 2013-07-07 11:30:31 +02:00
Dmitriy Zaporozhets 5315fd5a59 Merge pull request #4505 from m4tthumphrey/patch-1 
Added client list to API doc
 2013-07-06 02:38:04 -07:00
Matt Humphrey 4bba945437 Added client list to API doc 2013-07-06 10:14:06 +01:00
Yves Senn cab2ba0af3 Merge pull request #4476 from tstone2077/master 
Updating documentation to reflect #3836 (resolving #4443)
 2013-07-04 04:28:53 -07:00
Dmitriy Zaporozhets d0f3e993c5 Merge branch 'puma_cluster_recommendation' of /home/git/repositories/gitlab/gitlabhq 2013-07-04 11:08:33 +00:00
Jacob Vosmaer ae9e4a52c5 Add cluster mode instructions to puma.rb.example 2013-07-04 11:14:03 +02:00
Dmitriy Zaporozhets 2233f2e020 Merge pull request #4484 from Razer6/add_services_to_blacklist 
Add 'services' to path blacklist
 2013-07-03 12:03:39 -07:00
Yves Senn 3edca5d822 Merge pull request #4488 from dekimsey/patch-1 
Fix misspelling in social accounts tip
 2013-07-03 10:43:50 -07:00
dekimsey b8f51acf7b Fix misspelling in social accounts tip 2013-07-03 13:34:23 -04:00
Robert Schilling 702dc30448 Add 'services' to path blacklist, fixes #4470 2013-07-03 12:57:35 +02:00
Yves Senn d6ab5ad306 Merge pull request #4482 from kivlor/patch-1 
move 'make config/database.yml readable to git only' instruction
 2013-07-03 00:00:14 -07:00
Andrew Gallagher 0c4fd05d72 move 'make config/database.yml readable to git only' instruction 
I've moved the instruction in question to the the 
'Configure GitLab DB settings'. Can't change permission to a file that doesn't already exist 😉
 2013-07-03 15:15:50 +10:00
Dmitriy Zaporozhets 7588186e81 Merge branch 'warning_relative_url' of /home/git/repositories/gitlab/gitlabhq 2013-07-02 08:43:40 +00:00
Dmitriy Zaporozhets 66e10f0566 Fix header avatar 2013-07-02 11:42:39 +03:00
Dmitriy Zaporozhets 47f78a2c76 Merge pull request #4440 from jackbot/editable-notes 
Editable notes
 2013-07-02 01:41:28 -07:00
Jacob Vosmaer 9e86f3b156 Warn that relative URL's are unsupported 2013-07-02 10:27:51 +02:00
GitLab 015d8da731 Updating documentation to reflect #3836 (resolving #4443) 2013-07-01 21:14:39 -05:00
Jack Weeden 6fa06893e9 Add editable notes feature 2013-07-01 10:48:25 +01:00
Jack Weeden af81ff4e09 Changed 'javascript:;' links to '#' 2013-07-01 10:48:02 +01:00
Jack Weeden 22c00e6462 Removed before_filter as authentication is done within update method 2013-07-01 10:48:02 +01:00
Jack Weeden 1216a62e3b Authorize user on note update 2013-07-01 10:48:02 +01:00
Jack Weeden 20b2a0b235 Ability to edit comments 2013-07-01 10:48:02 +01:00
Jack Weeden b62c9e5991 Prevent 'toplevel constant SnippetsController referenced by Project::SnippetsController' warning 2013-07-01 10:48:01 +01:00
Jack Weeden 6a84d92672 Added update and delete_attachment actions to note controller 2013-07-01 10:47:39 +01:00
Jack Weeden 5ffc90d90d Merge remote-tracking branch 'upstream/master' 2013-07-01 10:43:01 +01:00
Dmitriy Zaporozhets 315d4cc8e8 Merge pull request #4415 from jackbot/master 
Couple of UI additions
 2013-06-30 09:32:47 -07:00
Dmitriy Zaporozhets 9b181dc649 Merge pull request #4442 from 1ed/projects-helper-fix 
fixed nav bar for empty repos (fixes #4375)
 2013-06-30 09:32:04 -07:00
Dmitriy Zaporozhets d9c02f30e5 Merge pull request #4460 from tstone2077/feature_help_markdown 
Adding detailed documentation of the markdown syntax.
 2013-06-30 01:22:21 -07:00
Dmitriy Zaporozhets c7da44d6d1 Fixed db/schema.rb 2013-06-30 11:20:57 +03:00
Ariejan de Vroom 2b4bebd9f2 Doc: set permission on config.database.yml 2013-06-29 17:31:08 +03:00
Ariejan de Vroom b8ce544703 Merge branch 'bbodenmiller-master' 
Closes #4331
 2013-06-29 17:19:15 +03:00
Ariejan de Vroom ab36cdec84 Tweak wording and phrasing 2013-06-29 17:19:10 +03:00
Ariejan de Vroom 729c74320a Merge branch 'master' of git://github.com/bbodenmiller/gitlabhq into bbodenmiller-master 2013-06-29 17:13:47 +03:00
Ariejan de Vroom 7fb9047223 Merge branch 'muskox-master' 
Closes #4424
 2013-06-29 16:37:51 +03:00
Scott PustayandAriejan de Vroom 2000f013f7 fixed typo in assgned 2013-06-29 16:37:41 +03:00
Thurston StoneandThurston Stone 2a601d26f2 Adding detailed documentation of the markdown syntax. 
This includes standard markdown as well as GitLab extended markdown as well as references to documents used.
 2013-06-29 00:44:24 -05:00