home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 17:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,591 Commits 48 Branches 340 Tags
0311efcbf0ea12d33dfa01b40ffb074c48e0ea10
Commit Graph
11591 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Pfeiffer 0311efcbf0 Delete stray brace 
* seems like a small mistake ;-)
 2014-09-18 18:39:30 +02:00
Sytse Sijbrandij 9079441dbb Merge pull request #7767 from bbodenmiller/patch-6 
check resque.yml.example for config changes
 2014-09-18 18:19:40 +02:00
Ben Bodenmiller c36b06e468 check resque.yml.example for config changes 2014-09-18 08:21:20 -07:00
Dmitriy Zaporozhets d8b8be4409 Merge branch 'ci-setup-doc' into 'master' 
CI setup doc

I want do describe what CI services we use

See merge request !1099
 2014-09-18 15:15:09 +00:00
Dmitriy Zaporozhets c0cecdb08a Mention build script 2014-09-18 15:14:40 +00:00
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
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
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
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
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 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
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
Robert Schilling b3a88a0fdc Merge pull request #7528 from exromany/patch-1 
Update user_management.md
 2014-09-13 23:12:21 +02:00
Dmitriy Zaporozhets e19c1f71d3 Merge pull request #7749 from wesgurn/master 
Adding ability to configure webhook timeout via gitlab.yml
 2014-09-13 22:47:23 +03:00
Marin Jankovski 9b59570c8e Fix diff_helper spec. 2014-09-12 21:02:50 +02:00
Marin Jankovski 75fbca83e3 Add one feature test. 2014-09-12 20:12:31 +02:00
Marin Jankovski 9945e8c424 Move organizing of comments to helper. 2014-09-12 19:51:44 +02:00
Marin Jankovski e84861d510 Remove unecesarry array operations. 2014-09-12 19:41:32 +02:00
Marin Jankovski 7d3daa4dfb Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-12 19:03:59 +02:00
Marin Jankovski 1fd58c84a0 Merge pull request #7741 from Razer6/refactor/remove_duplicate_steps 
[Refactor] Remove duplicated labels step
 2014-09-12 19:03:47 +02:00
Marin Jankovski 4bf24d239f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-12 19:03:10 +02:00
Marin Jankovski 5564fe3149 Add comments on the side-by-side diff. 2014-09-12 18:44:53 +02:00
Robert Schilling 5ac019946f Merge pull request #7743 from bbodenmiller/patch-12 
formatting changes, table->database
 2014-09-12 18:43:28 +02:00
Dmitriy Zaporozhets 29f990002c Merge branch 'backlog_socket' into 'master' 
Use the default Unicorn socket backlog value: 1024

See merge request !1087
 2014-09-12 16:22:01 +00:00
Dmitriy Zaporozhets 72d3d67a18 Merge pull request #7712 from bbodenmiller/patch-1 
set fail_timeout=0 as recommended by Unicorn
 2014-09-12 18:55:42 +03:00
Wes Gurney 81a70bf515 Adding ability to configure webhook timeout via gitlab.yml 2014-09-12 11:38:14 -04:00
Jacob Vosmaer 5704e6fee9 Use sockets to connect to Redis 2014-09-12 14:59:58 +02:00
Jacob Vosmaer e645b9a9d5 Use the default Unicorn socket backlog value: 1024 2014-09-12 13:43:52 +02:00
Dmitriy Zaporozhets cbb44b9da3 Merge pull request #7662 from Razer6/disable_buttons_on_empty_form 
[UX] Disable buttons if form is empty
 2014-09-12 13:41:48 +03:00
Dmitriy Zaporozhets 318d5d93e3 Merge pull request #7522 from Razer6/fix_tags_count 
[UX] Update tag count if tag gets deleted via web interface
 2014-09-12 13:39:56 +03:00
Robert Schilling a6084a7608 Merge pull request #7439 from bbodenmiller/patch-6 
set the number of workers to # of cores
 2014-09-12 11:37:54 +02:00
Sytse Sijbrandij 21134df202 Merge pull request #7713 from bbodenmiller/patch-5 
Add Feedback link
 2014-09-12 11:32:41 +02:00