summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* 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
* Add ability for admin to edit user identityDmitriy Zaporozhets2015-06-191-1/+1
* Admin can see and remove user identitiesDmitriy Zaporozhets2015-06-191-0/+2
* Use explicit if.Marin Jankovski2015-06-161-2/+3
* If kerberos is enabled require it.require_kerberos_when_enabledMarin Jankovski2015-06-151-0/+7
* Add RootControllerRobert Speicher2015-06-131-1/+1
* Fix a few remaining references to the old Theme names/IDsRobert Speicher2015-06-131-6/+7
* Add Gitlab::Themes module; remove Gitlab::ThemeRobert Speicher2015-06-131-1/+1
* Move the "Design" templates and logic to PreferencesRobert Speicher2015-06-131-1/+0
* Add Profiles::PreferencesControllerRobert Speicher2015-06-131-0/+1
* Ensure `session_expire_delay` field exists before accessing itrs-issue-1798Robert Speicher2015-06-131-4/+4
* Merge branch 'feature-session-expire-seconds-ui' into 'master'Douwe Maan2015-06-122-2/+7
|\
| * session_expire_seconds => session_expire_delaythemaze752015-06-102-3/+7
| * Add session expiration delay configuration through UI applicationEric Maziade2015-06-052-1/+2
* | Add a note that changing example configuration files requires changing omnibu...note_about_omnibus_changesMarin Jankovski2015-06-116-2/+17
* | remove extra spaceJeroen Nijhof2015-06-091-1/+0
* | update fog to 1.25.0 and add multipart upload supportJeroen Nijhof2015-06-092-0/+5
* | Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth'Douwe Maan2015-06-052-0/+6
|\ \ | |/ |/|
| * Add option to automatically link omniauth and LDAP identitiesAlex Lossent2015-06-032-0/+6
* | Remove show actions from Admin and Project DeployKeysRobert Speicher2015-06-031-2/+2
|/
View Lorry Controller Status