summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added rake task to add limits back in mysqlJeroen van Baarsen2014-03-111-0/+13
* 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
| * | | | | Add ldap check in application_controller and internal apiDmitriy Zaporozhets2014-03-103-2/+40
| * | | | | Remove copyrightDmitriy Zaporozhets2014-03-103-18/+0
| * | | | | Port LDAP code from EEDmitriy Zaporozhets2014-03-104-13/+168
* | | | | | Merge branch 'catch_missing_command' into 'master'Dmitriy Zaporozhets2014-03-101-0/+2
|\ \ \ \ \ \
| * | | | | | Catch missing commands in rake tasks with ''Jacob Vosmaer2014-03-101-0/+2
* | | | | | | Merge branch 'remove-dot-org' into 'master'Dmitriy Zaporozhets2014-03-105-20/+9
|\ \ \ \ \ \ \
| * | | | | | | Update references to gitlab dot com.dosire2014-03-105-20/+9
|/ / / / / / /
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-03-106-8/+49
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #6480 from jvanbaarsen/add-envrc-to-ignoreDmitriy Zaporozhets2014-03-101-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Add envrc to git-ignoreJeroen van Baarsen2014-03-061-0/+1
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge pull request #6492 from tsigo/gitlab-shell-custom-pathDmitriy Zaporozhets2014-03-101-4/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Respect custom gitlab_shell path in gitlab:gitlab_shell:check taskRobert Speicher2014-03-071-4/+4
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge pull request #6500 from tsigo/natural-tag-sortingDmitriy Zaporozhets2014-03-104-4/+44
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Remove extra whitespaceRobert Speicher2014-03-101-1/+1
| | * | | | | | Sort tag names using VersionSorterRobert Speicher2014-03-092-3/+40
| | * | | | | | Remove arguments from grouped_options_refsRobert Speicher2014-03-091-1/+1
| | * | | | | | Add version_sorter gemRobert Speicher2014-03-092-0/+3
| | |/ / / / /
* | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2014-03-104-12/+11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'add-enterprise-linux' into 'master'Dmitriy Zaporozhets2014-03-102-11/+9
| |\ \ \ \ \
| | * | | | | Add enterprise linux distributions as officially supported.dosire2014-03-072-11/+9
| | |/ / / /
| * | | | | Merge branch 'increase-nginx-push-size' into 'master'Dmitriy Zaporozhets2014-03-102-1/+2
| |\ \ \ \ \
| | * | | | | Update changelog.dosire2014-03-101-0/+1
| | * | | | | Some people are getting the error 'The remote end hung up unexpectedly' due t...dosire2014-03-101-1/+1
| |/ / / / /