summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tighten_logrotate' into 'master'Dmitriy Zaporozhets2014-03-132-6/+102
|\
| * Update the logrotate configuration in 6.7Jacob Vosmaer2014-03-121-0/+3
| * Add 6.6-to-6.7.md update guideJacob Vosmaer2014-03-121-0/+95
| * Logrotate daily, keeping 90 days of old logsJacob Vosmaer2014-03-121-6/+4
* | Merge branch 'patch_update_robustness' into 'master'Dmitriy Zaporozhets2014-03-131-2/+3
|\ \
| * | Use tags to do minor updates of GitLabJacob Vosmaer2014-02-271-2/+3
* | | Update httpartyDmitriy Zaporozhets2014-03-131-1/+1
* | | Create event and clear cache on new trag pushDmitriy Zaporozhets2014-03-131-0/+13
* | | Use gitlab:setup inside gitlab:testDmitriy Zaporozhets2014-03-131-3/+2
* | | Add mysql limits to db during setupDmitriy Zaporozhets2014-03-132-0/+9
* | | Fix BackgroundJobs pageDmitriy Zaporozhets2014-03-131-12/+6
| |/ |/|
* | Move images from vendor to app so they are compiled by railsDmitriy Zaporozhets2014-03-1212-0/+0
* | Correct image path to social iconsDmitriy Zaporozhets2014-03-121-2/+1
* | Rebuild schame from migrationsDmitriy Zaporozhets2014-03-121-17/+21
* | Merge pull request #6474 from jvanbaarsen/post-tag-hookDmitriy Zaporozhets2014-03-128-32/+152
|\ \
| * | Renamed oldrev/newrev to before/afterJeroen van Baarsen2014-03-062-4/+4
| * | Added newrev and oldrev to the hook dataJeroen van Baarsen2014-03-063-6/+12
| * | Post-receive hook can also fire TagPushServiceJeroen van Baarsen2014-03-051-1/+11
| * | Created a basic Git Tag Push serviceJeroen van Baarsen2014-03-052-0/+68
| * | Added tag_push_events to the web_hooksJeroen van Baarsen2014-03-055-49/+85
* | | Merge pull request #6510 from jvanbaarsen/rake-task-for-limitsDmitriy Zaporozhets2014-03-121-0/+13
|\ \ \
| * | | Changed limits to a higher orderJeroen van Baarsen2014-03-121-3/+3
| * | | Added rake task to add limits back in mysqlJeroen van Baarsen2014-03-111-0/+13
* | | | Fix error with reopened merge request not properly reloadingDaniel Cestari2014-03-121-1/+1
|/ / /
* | | Merge branch 'fix/social-account-block' into 'master'Dmitriy Zaporozhets2014-03-111-1/+1
|\ \ \
| * | | Check if any social providers are enabled.Jason Hollingsworth2014-03-061-1/+1
* | | | Refactor js behaviours helpersDmitriy Zaporozhets2014-03-119-147/+155
* | | | SHow group name in access granted emailDmitriy Zaporozhets2014-03-111-0/+2
* | | | More entries to CHANGELOGDmitriy Zaporozhets2014-03-111-0/+5
* | | | Merge branch 'simplify-emails-content' into 'master'Dmitriy Zaporozhets2014-03-1122-90/+88
|\ \ \ \
| * | | | Make the merge request notification emails more readablePierre de La Morinerie2014-03-033-18/+8
| * | | | Simplify the default layout of notification emailsPierre de La Morinerie2014-03-033-16/+21
| * | | | Remove the header banner in notification emailsPierre de La Morinerie2014-03-031-6/+0
| * | | | Remove the quote-style around message in notification emailsPierre de La Morinerie2014-03-031-1/+1
| * | | | Remove the author name from issue notes emailsPierre de La Morinerie2014-03-032-8/+0
| * | | | Add the description to the "new issue" and "new merge request" emailsPierre de La Morinerie2014-03-033-9/+31
| * | | | Linkify the reference to the project in the notification emails footerPierre de La Morinerie2014-03-031-1/+1
| * | | | Remove custom link to target in notification emailsPierre de La Morinerie2014-03-0314-36/+1
| * | | | Add a "View in GitLab" link in notification emailsPierre de La Morinerie2014-03-038-1/+31
* | | | | Use username instead of wierd email for first loginDmitriy Zaporozhets2014-03-111-1/+1
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-03-113-3/+4
|\ \ \ \ \
| * \ \ \ \ Merge pull request #6478 from infoMantisGmbH/masterDmitriy Zaporozhets2014-03-111-2/+2
| |\ \ \ \ \
| | * | | | | Allow underscore as the first char for project names.mk2014-03-061-2/+2
| * | | | | | Merge pull request #6503 from mjdetullio/fix/group-adminDmitriy Zaporozhets2014-03-112-1/+2
| |\ \ \ \ \ \
| | * | | | | | Fixes a bug with group member administrationMatt DeTullio2014-03-102-1/+2
* | | | | | | | Merge branch 'ldap-code' into 'master'Dmitriy Zaporozhets2014-03-1111-56/+243
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add User#requires_ldap_check? methodDmitriy Zaporozhets2014-03-112-3/+13
| * | | | | | | Add User#last_credential_check_atDmitriy Zaporozhets2014-03-112-38/+40
| * | | | | | | Remove non-exist method from ldap security checkDmitriy Zaporozhets2014-03-111-1/+0
| * | | | | | | Fix ldap_user_auth_specDmitriy Zaporozhets2014-03-101-1/+2