summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add, delete labels via APIRobert Schilling2014-08-1310-42/+205
* Merge branch 'more-email-threading' into 'master'Dmitriy Zaporozhets2014-08-122-3/+33
|\
| * Include "Merge-request reopened" emails in the proper email threadPierre de La Morinerie2014-07-252-3/+33
* | Merge branch 'mr-accept-widget' into 'master'Dmitriy Zaporozhets2014-08-121-26/+27
|\ \
| * | Separate accept MR settings from manual merge instructions. Remove confusing ...Dmitriy Zaporozhets2014-08-121-26/+27
|/ /
* | Update cahngelogDmitriy Zaporozhets2014-08-111-0/+1
* | Merge branch 'increase-import-timeout' into 'master'Dmitriy Zaporozhets2014-08-112-2/+2
|\ \
| * | Increase import timeout from 2 to 4 minutesDmitriy Zaporozhets2014-08-112-2/+2
|/ /
* | Merge branch 'improve-dev-seeds' into 'master'Dmitriy Zaporozhets2014-08-1110-169/+123
|\ \
| * | Improve developer seedsDmitriy Zaporozhets2014-08-119-148/+123
| * | Remove outdated seedsDmitriy Zaporozhets2014-08-111-21/+0
|/ /
* | Cleaner variable nameDmitriy Zaporozhets2014-08-111-3/+5
* | more changelog entriesDmitriy Zaporozhets2014-08-111-0/+3
* | Merge branch 'fix_markup_encoding' into 'master'Dmitriy Zaporozhets2014-08-112-1/+11
|\ \
| * | Force of markup output to be the input encodingRobert Schilling2014-08-112-1/+11
|/ /
* | Merge pull request #7463 from Razer6/improve/travisDmitriy Zaporozhets2014-08-111-2/+2
|\ \
| * | Add retry option of travis and bundlerRobert Schilling2014-08-101-2/+2
* | | Merge pull request #7468 from Razer6/fix_wrong_compare_messageDmitriy Zaporozhets2014-08-111-2/+2
|\ \ \
| * | | Turn if/else branch vor valid compare error messageRobert Schilling2014-08-111-2/+2
| |/ /
* | | Merge pull request #7466 from Razer6/improve_markup_handlingDmitriy Zaporozhets2014-08-118-44/+94
|\ \ \
| * | | Move calls to Gitlab::MarkdownHelper to application_helperRobert Schilling2014-08-116-13/+21
| * | | Use readme we support to render if there are multiple readmesRobert Schilling2014-08-119-45/+90
| * | | Use simple_format if we don't have a proper rendererRobert Schilling2014-08-102-7/+2
| * | | Rescue if markup fails, fixes #7455Robert Schilling2014-08-101-0/+2
| |/ /
* | | Revert "history for files follows after rename"Dmitriy Zaporozhets2014-08-111-1/+0
* | | Fix project search showing always no results if no merge requests matchesDmitriy Zaporozhets2014-08-111-2/+2
* | | Merge pull request #7385 from Razer6/fix_search_empty_projectDmitriy Zaporozhets2014-08-117-13/+61
|\ \ \
| * | | Restyle search pageRobert Schilling2014-08-113-5/+27
| * | | fix searching on empty project, prevent 500Robert Schilling2014-08-115-9/+35
| |/ /
* | | Merge pull request #7393 from Razer6/fix_500_hook_service_downDmitriy Zaporozhets2014-08-114-2/+28
|\ \ \
| * | | Prevent 500 if hook url is down, fixes #7376Robert Schilling2014-07-294-2/+28
* | | | Merge pull request #7417 from woita/follow-history-for-filesDmitriy Zaporozhets2014-08-111-0/+1
|\ \ \ \
| * | | | history for files follows after renameWalter Kreilinger2014-08-021-0/+1
* | | | | Merge pull request #7432 from Razer6/disable_comment_btn_if_emptyDmitriy Zaporozhets2014-08-112-3/+5
|\ \ \ \ \
| * | | | | Disable 'Save changes' button if input is empty, fixes #6351Robert Schilling2014-08-042-3/+5
* | | | | | Merge branch 'christian.taedcke/gitlab-ce-add_complete_commit_message_to_api'Dmitriy Zaporozhets2014-08-113-2/+7
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'add_complete_commit_message_to_api' of https://gitlab.com/chris...Dmitriy Zaporozhets2014-08-113-2/+7
| |\ \ \ \ \ \ |/ / / / / / /
| * | | | | | Add full commit message to commit api as field message.Christian Taedcke2014-07-253-2/+7
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'less-chatty-hipchat-intergation' into 'master'Dmitriy Zaporozhets2014-08-111-2/+9
|\ \ \ \ \ \
| * | | | | | Less verbose HipChat integrationStefan Kanev2014-07-291-2/+9
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'master' into 'master'Dmitriy Zaporozhets2014-08-113-4/+20
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add an option to GET /projects in the GitLab API to exclude archived projectsSasha Joseph2014-07-283-4/+20
* | | | | | Merge branch 'better-formulated-memory-requirements' into 'master'Dmitriy Zaporozhets2014-08-091-5/+5
|\ \ \ \ \ \
| * | | | | | Ensure that people know you need swap. Raise swap space for 512MB setups.Sytse Sijbrandij2014-08-091-5/+5
* | | | | | | Merge branch 'sidekiq-and-ram' into 'master'Dmitriy Zaporozhets2014-08-091-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Explain that sidekiq doesn't eat as much ram as some people seem to suspect h...Sytse Sijbrandij2014-08-091-0/+2
| |/ / / / / /
* | | | | | | Fix test broken by abdc4426486c6e6458c12ba49dd641d4c5ab257aDmitriy Zaporozhets2014-08-091-1/+1
* | | | | | | Merge branch 'improve-test-env' into 'master'Dmitriy Zaporozhets2014-08-0963-972/+825
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix testsDmitriy Zaporozhets2014-08-074-156/+158
| * | | | | | Fix application helper specsDmitriy Zaporozhets2014-08-071-2/+2