summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix link in integration docDmitriy Zaporozhets2014-04-071-1/+1
|
* Merge branch 'improve-oauth'Dmitriy Zaporozhets2014-04-079-5/+35
|\ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * Avoid false validation when create userDmitriy Zaporozhets2014-04-072-3/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Make oauth works for google oauth tooDmitriy Zaporozhets2014-04-072-2/+9
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add nickname to oauth_specDmitriy Zaporozhets2014-04-071-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Dont care about emails for oauthDmitriy Zaporozhets2014-04-071-2/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Skip require email for devise controllersDmitriy Zaporozhets2014-04-071-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Allow oauth signup without emailDmitriy Zaporozhets2014-04-076-4/+29
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'link-to-github-app' into 'master'Dmitriy Zaporozhets2014-04-072-2/+2
|\ \ | | | | | | | | | Link to github app
| * | Name should be oauth and not twitter.dosire2014-04-072-2/+2
|/ /
* | Merge branch 'wording-of-link-text' into 'master'Dmitriy Zaporozhets2014-04-072-1/+2
|\ \ | | | | | | | | | Wording of link text
| * | Image for GitHub app setup.dosire2014-04-071-0/+0
| | |
| * | Improve actionability of notice.dosire2014-04-071-1/+2
| | |
* | | fix image linkDmitriy Zaporozhets2014-04-071-2/+2
| | |
* | | Merge branch 'add-github-app' into 'master'Dmitriy Zaporozhets2014-04-071-1/+4
|\ \ \ | |/ / |/| | | | | Add github app
| * | Also add example for GitHub.dosire2014-04-071-1/+4
|/ /
* | Merge branch 'remove_reaping_frequency' into 'master'Dmitriy Zaporozhets2014-04-072-1/+1
|\ \ | | | | | | | | | Remove reaping frequency
| * | Disable connection reaping for MySQLJacob Vosmaer2014-04-072-1/+1
| | | | | | | | | | | | | | | On GitLab Cloud, MySQL connection reaping seemed to cause more problems (exceptions and segfaults in the native MySQL client) than it solved.
* | | Merge branch 'add-twitter' into 'master'Dmitriy Zaporozhets2014-04-075-1/+13
|\ \ \ | |/ / |/| | | | | Add twitter documentation
| * | Add twitter documentation.dosire2014-04-075-1/+13
| | |
* | | Merge branch 'fix/rake_satellites_create' into 'master'Dmitriy Zaporozhets2014-04-072-5/+3
|\ \ \ | | | | | | | | | | | | Fix popen bug in `rake gitlab:satellites:create`
| * | | Fix popen bug in `rake gitlab:satellites:create`Jacob Vosmaer2014-04-072-5/+3
|/ / / | | | | | | | | | | | | | | | 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
* | | Merge branch 'show_diff' into 'master'Dmitriy Zaporozhets2014-04-061-23/+24
|\ \ \ | |_|/ |/| | | | | Show note diff if diff exists
| * | Only show diff it exists.Marin Jankovski2014-04-041-23/+24
| | |
* | | Merge branch 'improve-mr-widget' into 'master'Dmitriy Zaporozhets2014-04-0611-103/+133
|\ \ \ | | | | | | | | | | | | | | | | | | | | Restyle merge request accept and ci widget Fixes #1138
| * | | Restyle merge request accept and ci widgetDmitriy Zaporozhets2014-04-0611-103/+133
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge pull request #6705 from razielgn/slack-service-attachmentsDmitriy Zaporozhets2014-04-063-14/+38
|\ \ \ | | | | | | | | Improved Slack integration with message attachments.
| * | | Improved Slack integration with message attachments.Federico Ravasio2014-04-063-14/+38
| | | |
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-04-0613-354/+355
|\ \ \ \
| * \ \ \ Merge pull request #5508 from jojosch/apidoc-jsonSytse Sijbrandij2014-04-0613-354/+355
| |\ \ \ \ | | | | | | | | | | | | Api-Doc and Web-Hooks JSON lint
| | * | | | Api-Doc JSON lintJohannes Schleifenbaum2014-04-0513-354/+355
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #5505
* | | | | | Use normal btn size for test serviceDmitriy Zaporozhets2014-04-061-1/+1
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Fix autocomplete cssDmitriy Zaporozhets2014-04-062-0/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'jacob-carlborg-remove_source_branch_button'Dmitriy Zaporozhets2014-04-064-5/+48
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch 'remove_source_branch_button' of ↵Dmitriy Zaporozhets2014-04-064-5/+48
| |\ \ \ \ |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Add button for removing source branch for merged MR's.Jacob Carlborg2013-12-195-6/+47
| | | | |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-04-061-0/+16
|\ \ \ \ \
| * \ \ \ \ Merge branch 'request/relative_submodules' into 'master'Dmitriy Zaporozhets2014-04-051-0/+16
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Merge branch 'master' into request/relative_submodulesTimm Drevensek2014-04-0479-857/+831
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch 'master' into request/relative_submodulesTimm Drevensek2014-04-0169-543/+864
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CHANGELOG
| | * \ \ \ \ Merge branch 'master' into request/relative_submodulesTimm Drevensek2014-03-26381-2444/+4160
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CHANGELOG
| | * | | | | | simplify link urlTimm Drevensek2014-02-281-4/+3
| | | | | | | |
| | * | | | | | fixed regex to match url pointing to a user repoTimm Drevensek2014-02-261-3/+3
| | | | | | | |
| | * | | | | | Add support for relative submodulesTimm Drevensek2014-02-252-0/+18
| | | | | | | |
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-04-055-9/+13
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Merge pull request #6701 from idealhack/add-ios-iconDmitriy Zaporozhets2014-04-051-0/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | Add icon for iOS home screen
| | * | | | | | Add icon for iOS home screenYang Li2014-04-051-0/+0
| |/ / / / / /
| * | | | | | Merge pull request #5950 from axilleas/bundler_parallelDmitriy Zaporozhets2014-04-041-0/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Refer to bundler's ability of parallel installation
| | * | | | | | Refer to bundler's ability of parallel installationAchilleas Pipinellis2014-03-261-0/+7
| | | | | | | |
| * | | | | | | Merge pull request #6658 from tsigo/rs-important-dirsDmitriy Zaporozhets2014-04-044-9/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make sure important directories exist in git
View Lorry Controller Status