home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 175a913065 CI setup docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-18 16:45:18 +03:00
Job van der Voort cc96496996 Merge branch 'security-in-dvcs' into 'master' 
Security in dvcs

Explain why access & sharing are the same.

See merge request !1097
 2014-09-18 07:59:45 +00:00
Sytse Sijbrandij 664b433afe Add explanation about unintentional sharing. 2014-09-18 09:44:12 +02:00
Sytse Sijbrandij ff4a45effb Add information on information exclusivity. 2014-09-18 09:41:38 +02:00
Marin Jankovski 01c101752d Merge pull request #7765 from bbodenmiller/patch-6 
remove rack attack middleware update
 2014-09-18 09:26:57 +02:00
Ben Bodenmiller 28ee311d0c remove rack attack middleware update 
Hasn't changed since 7.2 release: https://github.com/gitlabhq/gitlabhq/commits/master/config/initializers/rack_attack.rb.example
 2014-09-17 20:01:25 -07:00
Dmitriy Zaporozhets 4a21db82ec Merge branch 'first-meaningful-line-in-md' of https://github.com/yglukhov/gitlabhq into 7-4-pre 2014-09-17 21:37:34 +03:00
Dmitriy Zaporozhets 8bff9a4098 Merge branch 'refator-members-logic' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre 2014-09-17 21:31:41 +03:00
Dmitriy Zaporozhets 6dff16a679 Merge branch 'readme-anchor' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre 2014-09-17 21:31:22 +03:00
Dmitriy Zaporozhets d771253bdb Fix README anchor tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-17 20:37:41 +03:00
Marin Jankovski 630d042433 Version 7.3.rc1. v7.3.0.rc1 2014-09-17 18:28:00 +02:00
Marin Jankovski 2b35c88790 Updates to the update/install docs for 7.3.rc1 2014-09-17 18:27:23 +02:00
Sytse Sijbrandij 8952c5ce2e Highlight the word master when referring to a branch name to make it more obvious, thanks Ben. 2014-09-17 11:23:44 +02:00
Job van der Voort 553680d04e Merge branch 'doc/welcome_message' into 'master' 
Document the extra.sign_in_text setting for CE

See merge request !1027
 2014-09-17 08:22:28 +00:00
Sytse Sijbrandij 7ecc730a7e Add sentence about tools not being able to compensate for changing commit id's. 2014-09-17 09:44:11 +02:00
Sytse Sijbrandij 74fecb495c Improve the rebase reasoning. 2014-09-17 09:14:12 +02:00
Ben Bodenmiller dcc51b0d2c cleanup empty repo page 
Improve wording on empty repo page and make header capitalization consistent
 2014-09-16 21:48:08 -07:00
Dmitriy Zaporozhets 39c4784419 Merge branch 'gitlab_check_hooks_symlink' into 'master' 
Check for hooks directory symlink in gitlab:check

See merge request !1094
 2014-09-16 16:26:35 +00:00
Dmitriy Zaporozhets 5104b6c810 Merge branch 'dont-rebase-pushed-commits' into 'master' 
Dont rebase pushed commits

/cc @jacobvosmaer

See merge request !1095
 2014-09-16 16:26:11 +00:00
Sytse Sijbrandij 5a14213f06 Don't rebase pushed commits. 2014-09-16 17:50:33 +02:00
Dmitriy Zaporozhets 500a1a7bc3 Merge branch 'new_relic' into 'master' 
Add dormant New Relic gem

See merge request !1089
 2014-09-16 15:41:36 +00:00
Jacob Vosmaer 66ae1bde87 Add dormant New Relic gem 
The gem can be enabled and configured via environment variables.
 2014-09-16 17:31:20 +02:00
Jacob Vosmaer 45a6b62407 Check for hooks directory symlink in gitlab:check 2014-09-16 17:11:25 +02:00
Marin Jankovski 71e0554449 Merge branch 'order_mr_api' into 'master' 
API MR ordering

Fixes #1477

See merge request !1076
 2014-09-16 06:46:17 +00:00
Marin Jankovski 685754b088 Fix typo in comment. 2014-09-16 08:44:50 +02:00
jubianchi 998cd3cb63 Improve error reporting on users API 
* users (#6878, #3526, #4209): Validation error messages are now exposed through 400 responses, 409 response are sent in case of duplicate email or username
* MRs (#5335): 409 responses are sent in case of duplicate merge request (source/target branches), 422 responses are sent when submiting MR fo/from unrelated forks
* issues
* labels
* projects
 2014-09-16 01:25:24 +02:00
Dmitriy Zaporozhets 892371bc22 Merge branch 'redis_socket' into 'master' 
Use sockets to connect to Redis

See merge request !1088
 2014-09-15 14:49:02 +00:00
Dmitriy Zaporozhets 07bc48c526 Merge branch 'use-members-models' into 'refator-members-logic' 
Use members models

See merge request !1
 2014-09-15 14:41:22 +00:00
Dmitriy Zaporozhets 4f1bb91a75 Fix finder and tests for new membership models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 16:45:28 +03:00
Marin Jankovski f37b4cc5ad Different created_at and updated_at time in api merge_requests spec. 2014-09-15 11:54:49 +02:00
Marin Jankovski b99b2e60d5 Ordering and sorting for MR in api. 2014-09-15 11:54:49 +02:00
Dmitriy Zaporozhets 6558e52d90 More fixes to project members api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 12:01:45 +03:00
Dmitriy Zaporozhets ce49f035cf Fix access_level api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 11:55:36 +03:00
Dmitriy Zaporozhets 77c64a9b36 Replace project_access attribute with access_level in specs and API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 11:36:50 +03:00
Dmitriy Zaporozhets 38ed0deaac Move hook models in separate dir 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 11:31:30 +03:00
Dmitriy Zaporozhets 39ab7527d4 Fix project member management 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 11:04:25 +03:00
Dmitriy Zaporozhets bdbadebe3e Fix adminarea and emails for new membership logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 10:57:02 +03:00
Dmitriy Zaporozhets 09b23228df Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-15 10:20:43 +03:00
Dmitriy Zaporozhets 79190fe06b Merge branch 'implement_comments_on_parallel_diff' into 'master' 
Implement comments on parallel diff

Fixes #1565

See merge request !1090
 2014-09-15 07:19:50 +00:00
Dmitriy Zaporozhets 1aa48174db Fix STI+polymorphic for Group <-> GroupMember 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 21:52:54 +03:00
Dmitriy Zaporozhets 13af7de941 Fix migration and association for new members table 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 20:38:57 +03:00
Dmitriy Zaporozhets 8210d81381 Replace old references of users_project & users_group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 19:51:54 +03:00
Dmitriy Zaporozhets c69b8e0459 Huge replace of old users_project and users_group references 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 19:32:51 +03:00
Dmitriy Zaporozhets eb4a9bfbca Add STI to Member model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 18:09:33 +03:00
Dmitriy Zaporozhets e9b32005eb Migrate old membership objects to new Member model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 18:09:23 +03:00
Dmitriy Zaporozhets 757426dbb1 Add Member AR model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 17:54:10 +03:00
Dmitriy Zaporozhets 3503b504ea Add members table migration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 17:18:58 +03:00
Robert Schilling 67cf376d97 Merge pull request #7753 from tamers/patch-1 
Fix grammatical error in 'not merged changes' msg
 2014-09-14 12:32:01 +02:00
Tamer Sherif a391cd21d7 Fix grammatical error in 'not merged changes' msg 2014-09-14 12:31:32 +03:00
Ciro Santilli 1da0c0b6e4 Factor out commit list from compare and new MR. 2014-09-14 10:15:14 +02:00