summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Add an option to automatically sign-in with an Omniauth provider without show...Alex Lossent2015-05-293-0/+8
* Merge branch 'feature/saml_support' into 'master'Douwe Maan2015-05-291-0/+9
|\
| * Add SAML support via OmniauthAlex Lossent2015-05-271-0/+9
* | Merge branch 'rs-teaspoon' into 'master'Dmitriy Zaporozhets2015-05-292-2/+2
|\ \
| * | Disable Rack::MiniProfiler for /teaspoon pathrs-teaspoonRobert Speicher2015-05-281-1/+2
| * | Remove jasmine-rails; add teaspoonRobert Speicher2015-05-282-2/+1
| |/
* | Add MergeRequests#commits action and routeRobert Speicher2015-05-291-0/+1
|/
* Allow to configure gitlab_shell_secret locationJakub Jirutka2015-05-163-4/+9
* Fix.Douwe Maan2015-05-151-13/+5
* Improve fix.attr_encryped_no_db_connectionDouwe Maan2015-05-151-13/+12
* Don't require DB conncetion in AttrEncrypted.Douwe Maan2015-05-151-0/+29
* Merge branch 'omniauth-csrf' into 'master'Dmitriy Zaporozhets2015-05-141-0/+5
|\
| * Protect OmniAuth request phase against CSRF.Douwe Maan2015-04-241-0/+5
* | Improve OAuth application flash messages.Douwe Maan2015-05-131-5/+5
* | Add otp_attempt to filtered parametersRobert Speicher2015-05-091-1/+1
* | Render 2fa recovery codes instead of downloading itDmitriy Zaporozhets2015-05-091-1/+1
* | Add support for backup codesDmitriy Zaporozhets2015-05-092-1/+6
* | Fix rubocop complainDmitriy Zaporozhets2015-05-091-1/+1
* | Create Two-factor authentication resource for userDmitriy Zaporozhets2015-05-091-0/+1
* | Init 2 factor authentication for user modelDmitriy Zaporozhets2015-05-091-0/+4
* | Merge branch 'rs-task_list' into 'master'Dmitriy Zaporozhets2015-05-081-0/+1
|\ \
| * | Disable Rack::MiniProfiler for Jasmine's specs routeRobert Speicher2015-05-061-0/+1
* | | Revert "Allow to configure smtp and sendmail in gitlab.yml"Dmitriy Zaporozhets2015-05-066-89/+40
|/ /
* | Allow to configure smtp and sendmail in gitlab.ymlJakub Jirutka2015-05-066-40/+89
* | Fix config template from parse errorsStan Hu2015-05-031-3/+3
View Lorry Controller Status