summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Update init scripts.Douwe Maan2015-08-192-20/+84
* Send a rejection email when the incoming email couldn't be processed.Douwe Maan2015-08-191-6/+10
* Turn reply-by-email attachments into uploads.Douwe Maan2015-08-191-0/+33
* Changes and stuff.Douwe Maan2015-08-183-19/+305
* Reply by email POCDouwe Maan2015-08-181-0/+50
* Merge branch 'fix-authhash-infinite-loop' into 'master'Robert Speicher2015-08-181-16/+30
|\
| * Fix infinite loop when SAML was incorrectly configured.fix-authhash-infinite-loopDouwe Maan2015-08-171-16/+30
* | Merge branch 'fix-rake-info' into 'master'Robert Speicher2015-08-181-2/+1
|\ \
| * | Fix gitlab:env:info rake task.fix-rake-infoDouwe Maan2015-08-171-2/+1
| |/
* | Merge branch 'mr-source-branch-clear-cache' into 'master'Dmitriy Zaporozhets2015-08-181-0/+1
|\ \
| * | Clear cache to prevent listing deleted branches after MR removes source branchStan Hu2015-08-141-0/+1
* | | Merge branch 'rs-remove-gfm_with_options' into 'master'Douwe Maan2015-08-172-12/+2
|\ \ \
| * | | Remove the `gfm_with_options` helperrs-remove-gfm_with_optionsRobert Speicher2015-08-122-12/+2
| |/ /
* | | Merge branch 'fix-backslashes-inline-diff' into 'master'Douwe Maan2015-08-171-2/+5
|\ \ \ | |_|/ |/| |
| * | Fix bug where backslashes in inline diffs could be droppedStan Hu2015-08-111-2/+5
* | | Require Ruby 2.1.0 in `gitlab:app:check` taskRobert Speicher2015-08-151-1/+1
* | | Merge branch 'mysql_insecure_password_warnings' into 'master'Stan Hu2015-08-141-2/+5
|\ \ \ | |_|/ |/| |
| * | Workaround the warnings emitted by MySQL 5.6 regarding password on theTed Strzalkowski2015-08-121-2/+5
| |/
* | Merge branch 'note-query-information' into 'master'Stan Hu2015-08-121-0/+3
|\ \
| * | api: add 'system', 'upvote', and 'downvote' fields to note queriesBen Boeckel2015-08-121-0/+3
| |/
* | markup_helper: detect .mkd and .mkdn as markdownBen Boeckel2015-08-121-1/+1
|/
* Merge branch 'revert-satellites' into 'master' Dmitriy Zaporozhets2015-08-1115-31/+754
|\
| * Revert "Fix editing files via API"Dmitriy Zaporozhets2015-08-111-26/+24
| * Revert "Merge branch 'web-editor-rugged' into 'master'"Dmitriy Zaporozhets2015-08-114-0/+210
| * Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-1110-5/+520
* | Merge branch 'fix-diff-highlighting' into 'master'Douwe Maan2015-08-101-20/+21
|\ \
| * | Fix diff syntax highlightingStan Hu2015-08-101-20/+21
| |/
* | Merge branch 'disable-autocrlf-for-binary-files' into 'master'Stan Hu2015-08-101-1/+1
|\ \ | |/ |/|
| * Fix corrupted binary files when using API files endpointStan Hu2015-08-091-1/+1
* | Merge branch 'rs-reference-data-attrs' into 'master' Robert Speicher2015-08-108-8/+32
|\ \ | |/ |/|
| * Add `data-[type]-id` attribute to reference linksrs-reference-data-attrsRobert Speicher2015-08-088-8/+32
* | Merge branch 'bitbucket-show-incompatible' into 'master'Douwe Maan2015-08-071-0/+4
|\ \
| * | Show incompatible projects in Bitbucket import statusStan Hu2015-08-071-0/+4
| |/
* | Merge branch 'master' into comment-updated-byDouwe Maan2015-08-0615-533/+141
|\ \ | |/
| * Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'Douwe Maan2015-08-061-1/+1
| |\
| | * Fix "Network" and "Graphs" pages for branches with encoded slashesStan Hu2015-08-021-1/+1
| * | Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-0510-520/+5
| |\ \
| | * \ Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-0424-118/+484
| | |\ \
| | * | | Fix merge api and specDmitriy Zaporozhets2015-08-041-1/+1
| | * | | Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-161-1/+5
| | * | | Fix application initializeDmitriy Zaporozhets2015-07-151-0/+4
| | * | | Remove satellitesDmitriy Zaporozhets2015-07-159-523/+0
| * | | | Merge branch 'rs-fix-rouge-inline-theme' into 'master' Stan Hu2015-08-041-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix the `inline_theme` option for the Rouge formatterrs-fix-rouge-inline-themeRobert Speicher2015-08-011-1/+1
| * | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-08-0310-22/+173
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'api-useremails' into 'master' Robert Speicher2015-07-312-6/+121
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fix indentationDouwe Maan2015-07-311-11/+11
| | | * | Merge branch 'master' into api-useremailsDouwe Maan2015-07-318-14/+42
| | | |\ \
| | | * | | Add ability to manage user email addresses via the API.Douwe Maan2015-07-292-0/+115
| | * | | | Fix multi-line syntax highlightingStan Hu2015-07-301-2/+10
| | | |/ / | | |/| |
View Lorry Controller Status