home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,195 Commits 48 Branches 340 Tags
8df66046d90cc4f4c53d8cf67ca2af5fcf87fd49
Commit Graph
9195 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 8df66046d9 Merge branch 'fix-faulty-namespaces' into 'master' 
Fix faulty namespaces

Fixes #908

Now with updated schema.
 2014-04-07 15:45:37 +00:00
Dmitriy Zaporozhets 26c5102002 Fix link in integration doc 2014-04-07 14:39:45 +00:00
Job van der Voort 52cf11b9f2 add a space 2014-04-07 14:26:52 +00:00
Dmitriy Zaporozhets 650d0bc695 Merge branch 'improve-oauth' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-04-07 17:15:31 +03:00
Job van der Voort 6d19696267 Fix faulty namespaces 2014-04-07 16:03:49 +02:00
Dmitriy Zaporozhets e6f58cb87d Avoid false validation when create user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 16:47:37 +03:00
Dmitriy Zaporozhets 5436d6afd6 Make oauth works for google oauth too 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 16:36:33 +03:00
Dmitriy Zaporozhets 021faad3fe Add nickname to oauth_spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 16:03:05 +03:00
Dmitriy Zaporozhets 5d6e9ea8ef Merge branch 'link-to-github-app' into 'master' 
Link to github app
 2014-04-07 13:02:19 +00:00
dosire 5b018cc5b1 Name should be oauth and not twitter. 2014-04-07 14:52:35 +02:00
Dmitriy Zaporozhets 4ab32be8a7 Dont care about emails for oauth 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 15:20:40 +03:00
Dmitriy Zaporozhets e7f8080666 Merge branch 'wording-of-link-text' into 'master' 
Wording of link text
 2014-04-07 12:18:04 +00:00
dosire db880cf39f Image for GitHub app setup. 2014-04-07 14:17:40 +02:00
Dmitriy Zaporozhets c06255e150 fix image link 2014-04-07 12:17:32 +00:00
dosire 6e4dbde2e7 Improve actionability of notice. 2014-04-07 14:14:14 +02: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 84d17f7965 Skip require email for devise controllers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 14:32:59 +03:00
Dmitriy Zaporozhets a73df4f72d Allow oauth signup without email 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 14:09:29 +03: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