summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Allow configuration of LDAP attributes GitLab will use for the new user account.Douwe Maan2015-09-081-0/+15
* Merge branch 'crowd' into 'master'Valery Sizov2015-09-072-1/+6
|\
| * Crowd integrationValery Sizov2015-09-022-1/+6
* | Merge branch 'fix-wiki-page-history' into 'master'Douwe Maan2015-09-071-9/+13
|\ \
| * | Fix broken Wiki Page HistoryStan Hu2015-09-011-9/+13
| |/
* | Avoid instance variable re-use troubleJacob Vosmaer2015-09-021-1/+1
|/
* Merge branch 'gitlab-git-http-server' into 'master'Dmitriy Zaporozhets2015-09-011-6/+1
|\
| * Replace grack with gitlab-git-http-serverJacob Vosmaer2015-08-311-6/+1
* | retrieving oauth token with LDAP credentialsoauth_token_with_ldapValery Sizov2015-08-311-2/+1
|/
* Dashboard activity as separate pageDmitriy Zaporozhets2015-08-251-0/+1
* Merge branch 'reply-by-email-improvements' into 'master'Robert Speicher2015-08-241-0/+2
|\
| * Ignore empty incoming messages.Douwe Maan2015-08-241-0/+2
* | Only include base URL in OmniAuth full_host parameterStan Hu2015-08-232-9/+19
|/
* Merge branch 'master' into reply-by-emailDouwe Maan2015-08-202-2/+3
|\
| * Import sources: settings in the admin interfaceArtem Sidorenko2015-08-201-0/+1
| * Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-2/+2
* | Add documentation.Douwe Maan2015-08-192-13/+26
* | Changes and stuff.Douwe Maan2015-08-181-1/+1
* | Reply by email POCDouwe Maan2015-08-183-0/+25
|/
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-2/+2
* Merge branch 'gravatar-host-link' into 'master'Stan Hu2015-08-091-0/+10
|\
| * ink to configured gravatar host on profile pageBen Bodenmiller2015-08-051-0/+10
* | Add abuse report management in admin areaDmitriy Zaporozhets2015-08-061-0/+1
* | Allow users to send abuse reportsDmitriy Zaporozhets2015-08-061-0/+3
* | Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-051-2/+2
|\ \
| * \ Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-047-54/+26
| |\ \ | | |/
| * | Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-161-2/+2
* | | Add "Confirm user" button in user admin pageStan Hu2015-08-051-0/+1
| |/ |/|
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-031-44/+0
|\ \
| * | Bump redis-store to 1.1.6 and remove redid-store-fix-expiryredis-storeKamil Trzcinski2015-07-311-44/+0
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-p...Jacob Vosmaer2015-07-291-8/+17
|\ \ \ | |/ /
| * | Allow custom label to be set for authentication providers.auth-icons-labelsDouwe Maan2015-07-231-8/+17
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-p...Jacob Vosmaer2015-07-274-2/+7
|\ \ \ | |/ /
| * | Merge branch 'set-omniauth-full-host' into 'master'Marin Jankovski2015-07-201-0/+1
| |\ \
| | * | Set OmniAuth full_host parameter to ensure redirect URIs are correctStan Hu2015-07-171-0/+1
| * | | Fix OAuth provider bug where GitLab would not go return to the redirect_uri a...Stan Hu2015-07-181-1/+2
| |/ /
| * | Merge branch 'add-support-remove-milestone' into 'master'Stan Hu2015-07-171-1/+1
| |\ \
| | * | Add support for destroying project milestonesStan Hu2015-07-171-1/+1
| | |/
| * | Expire Rails cache entries after two weeksJacob Vosmaer2015-07-151-0/+1
| |/
| * Add disable_two_factor route for Admin::UsersRobert Speicher2015-07-101-0/+1
| * Move project activity to separate tab. Add more features to project home pageDmitriy Zaporozhets2015-07-071-0/+1
* | Remove weird trailing charactersJacob Vosmaer2015-07-241-1/+1
* | Use a separate backup test directory and nuke its contentsJacob Vosmaer2015-07-241-0/+2
* | Allow custom backup archive permissionsJacob Vosmaer2015-07-062-0/+2
|/
* Merge branch 'audit_log' into 'master'Dmitriy Zaporozhets2015-07-061-1/+1
|\
| * Audit log for user authenticationValery Sizov2015-07-061-1/+1
* | Add support for unlocking users in admin settingsStan Hu2015-07-021-0/+1
|/
* Enable rack profiler by defaultDmitriy Zaporozhets2015-06-241-1/+1
* Refactor admin user pageDmitriy Zaporozhets2015-06-221-0/+3
* Move identities list to own controller actionDmitriy Zaporozhets2015-06-191-1/+1
View Lorry Controller Status