home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 04:56:16 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,179 Commits 48 Branches 340 Tags
459e62959107ff407693d62e6dceae8eb26dc0b6
Commit Graph
9179 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Cyril Rohr 459e629591 Fix Procfile to be usable in production. 2014-04-07 15:45:52 +01:00
Dmitriy Zaporozhets 11d3a00c28 Merge branch 'add-github-app' into 'master' 
Add github app
 2014-04-07 12:12:42 +00:00
dosire a4523c5292 Also add example for GitHub. 2014-04-07 14:11:00 +02:00
Dmitriy Zaporozhets 0dc48fac6b Merge branch 'remove_reaping_frequency' into 'master' 
Remove reaping frequency
 2014-04-07 10:40:27 +00:00
Dmitriy Zaporozhets d8ed899038 Merge branch 'add-twitter' into 'master' 
Add twitter documentation
 2014-04-07 10:40:15 +00:00
Jacob Vosmaer 5163a8fcb9 Disable connection reaping for MySQL 
On GitLab Cloud, MySQL connection reaping seemed to cause more problems
(exceptions and segfaults in the native MySQL client) than it solved.
 2014-04-07 12:32:24 +02:00
dosire ba72bd1dee Add twitter documentation. 2014-04-07 11:53:48 +02:00
Dmitriy Zaporozhets ab7b8b2125 Merge branch 'fix/rake_satellites_create' into 'master' 
Fix popen bug in `rake gitlab:satellites:create`
 2014-04-07 09:42:13 +00:00
Jacob Vosmaer bcfd9386f5 Fix popen bug in rake gitlab:satellites:create 
The Satellite#create method no longer sets the `$?` global variable.
Instead, we can use the method return value to test if the satellite was
created successfully
 2014-04-07 11:22:27 +02:00
Dmitriy Zaporozhets bfd4494890 Merge branch 'show_diff' into 'master' 
Show note diff if diff exists
 2014-04-06 17:01:15 +00:00
Dmitriy Zaporozhets 4e002a7167 Merge branch 'improve-mr-widget' into 'master' 
Restyle merge request accept and ci widget

Fixes #1138
 2014-04-06 14:57:51 +00:00
Dmitriy Zaporozhets 8e7f80eed1 Restyle merge request accept and ci widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-06 17:10:37 +03:00
Dmitriy Zaporozhets bc40efa19d Merge pull request #6705 from razielgn/slack-service-attachments 
Improved Slack integration with message attachments.
 2014-04-06 14:27:02 +03:00
Dmitriy Zaporozhets 3740597f56 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-04-06 14:26:38 +03:00
Dmitriy Zaporozhets 7ced2eb447 Use normal btn size for test service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-06 14:26:24 +03:00
Sytse Sijbrandij 26ab17a800 Merge pull request #5508 from jojosch/apidoc-json 
Api-Doc and Web-Hooks JSON lint
 2014-04-06 13:19:52 +02:00
Dmitriy Zaporozhets ae2089a98e Fix autocomplete css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-06 14:10:48 +03:00
Dmitriy Zaporozhets 84a8b29fbf Merge branch 'jacob-carlborg-remove_source_branch_button' 2014-04-06 13:55:18 +03:00
Dmitriy Zaporozhets 1a17289bd3 Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-remove_source_branch_button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/javascripts/merge_requests.js.coffee
	app/assets/stylesheets/sections/merge_requests.scss
	app/controllers/projects/merge_requests_controller.rb
 2014-04-06 13:54:54 +03:00
Federico Ravasio 6a9eb4b231 Improved Slack integration with message attachments. 2014-04-06 11:57:48 +02:00
Dmitriy Zaporozhets 2ceef76917 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-04-06 10:16:44 +03:00
Dmitriy Zaporozhets 7ae488ede3 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-04-05 13:20:01 +03:00
Dmitriy Zaporozhets b01e711621 Merge pull request #6701 from idealhack/add-ios-icon 
Add icon for iOS home screen
 2014-04-05 13:17:21 +03:00
Dmitriy Zaporozhets 2f945ac535 Merge branch 'request/relative_submodules' into 'master' 
Add support for relative submodules

Currently there is no support for submodules where the url starts with ./ or ../, it will fail with an Routing Error.
This is required is you don't want to force a submodule to ssh or http usage.

For a given Repository __http://server/group/root.git__

---

[submodule "sub1"]
	path = sub1
	url = ../submodule.git

Wrong: http://server/group/ __root__ /submodule.git
Correct: http://server/group/submodule.git

---

[submodule "sub2"]
	path = sub2
	url = ../../any/submodule.git

Wrong: http://server/ __group/any__ /submodule.git
Corrent: http://server/any/submodule.git
 2014-04-05 10:00:07 +00:00
Johannes Schleifenbaum 49addad7b5 Api-Doc JSON lint 
Fixes: #5505
 2014-04-05 08:37:42 +02:00
Yang Li 8c7f4f2bba Add icon for iOS home screen 2014-04-05 11:13:38 +08:00
Timm Drevensek 4d1945028e Merge branch 'master' into request/relative_submodules 2014-04-04 23:50:39 +02:00
Marin Jankovski 17bb700712 Only show diff it exists. 2014-04-04 19:12:23 +02:00
Dmitriy Zaporozhets 3d2c81856c Merge branch 'deduplicate-help' into 'master' 
Deduplicate help
 2014-04-04 15:18:42 +00:00
Dmitriy Zaporozhets 64341cca11 Merge branch 'gems-bump' into 'master' 
Update gitlab_git and gitlab-grit gem versions
 2014-04-04 15:15:43 +00:00
Sytse Sijbrandij 7611ce72b9 Merge branch 'doc/ldap' into 'master' 
Explain LDAP activation for existing users
 2014-04-04 14:47:14 +00:00
Jacob Vosmaer bb9ec71127 Explain how existing users can enable LDAP 2014-04-04 16:22:11 +02:00
Sytse Sijbrandij a6bc4f0c46 Merge branch 'small-feature-requests' into 'master' 
Small feature requests

/cc @dzaporozhets
 2014-04-04 13:52:27 +00:00
dosire e159a56157 Ask for small feature requests. 2014-04-04 15:52:07 +02:00
Dmitriy Zaporozhets 11f864c940 Update gitlab_git and gitlab-grit gem versions 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-04 15:22:03 +03:00
Dmitriy Zaporozhets 1f1cfc9eba Merge pull request #5950 from axilleas/bundler_parallel 
Refer to bundler's ability of parallel installation
 2014-04-04 14:37:07 +03:00
Dmitriy Zaporozhets ad3a3e5201 Merge pull request #6658 from tsigo/rs-important-dirs 
Make sure important directories exist in git
 2014-04-04 14:31:26 +03:00
Dmitriy Zaporozhets 14b68586b8 Merge branch 'no_email_on_notification_level_change' into 'master' 
Don't send emails on notification level change
 2014-04-04 09:30:16 +00:00
Marin Jankovski a3af64b418 Merge branch 'add-one-line-upgrader-command' into 'master' 
Add One Line Upgrader Command

This is related to my previous MR from one month ago. I've done a fresh checkout of master and reapplied the path so that the tree is clean again, as requested.
 2014-04-04 08:32:08 +00:00
Sytse Sijbrandij 0ecd7f790e Merge branch 'update_update_guides' into 'master' 
Add to update guides satellites group permission.
 2014-04-04 08:26:23 +00:00
Remy van Elst 68436e964f Add one line upgrade command. 2014-04-04 10:19:40 +02:00
Marin Jankovski 04324908fb Add to update guides satellites group permission. 2014-04-04 09:36:25 +02:00
dosire 6205b068cd Reduce the number of times people send emails or file issues out of the blue. 2014-04-04 08:05:09 +02:00
Dmitriy Zaporozhets 49a5159946 Merge branch 'improve-mr-services' into 'master' 
Improve MR services
 2014-04-03 16:43:30 +00:00
Dmitriy Zaporozhets 860f159d41 Add note when MR assignee changes. Add more tests to MR services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-03 18:16:05 +03:00
Marin Jankovski eca269f7f9 Fix user_project observer test. 2014-04-03 16:35:33 +02:00
Dmitriy Zaporozhets 8cc5e85543 Mention protected branch force push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-03 17:06:11 +03:00
Dmitriy Zaporozhets 5350492842 Fix support for force_push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-03 15:03:45 +03:00
Dmitriy Zaporozhets 207f34b890 Merge pull request #6190 from Popl7/add-better-branch-protection-against-history-rewrite-and-deletion 
protect protected branched to force updates
 2014-04-03 14:33:34 +03:00
Dmitriy Zaporozhets 6594ce1de0 Merge branch 'specific-warning-for-version-managers' into 'master' 
Specific-warning-for-version-managers
 2014-04-03 11:28:31 +00:00