summaryrefslogtreecommitdiff
path: root/app/models/application_setting.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into ce_upstreamValery Sizov2015-12-251-27/+38
|\
| * WIP require two factor authenticationGabriel Mazetto2015-12-241-26/+33
| * Use method that creates runners registration tokenGrzegorz Bizon2015-12-231-0/+4
* | Merge remote-tracking branch 'ce/master'Robert Speicher2015-12-171-6/+6
|\ \ | |/
| * Fixed Rubocop offensesGabriel Mazetto2015-12-151-6/+6
* | Merge remote-tracking branch 'ce/master' into ce-to-eeRobert Speicher2015-12-151-1/+6
|\ \ | |/
| * Ensure that app settings contains runners registration tokenGrzegorz Bizon2015-12-111-0/+2
| * Refactor `TokenAuthenticatable` to improve reusabilityGrzegorz Bizon2015-12-111-0/+3
| * Add `runners_registration_token` to ApplicationSettingsGrzegorz Bizon2015-12-111-1/+1
* | Merge remote-tracking branch 'origin/master' into ce_upstreamValery Sizov2015-12-091-9/+7
|\ \ | |/
| * Add custom UrlValidatorRobert Speicher2015-12-071-2/+2
| * Fix application settings cache not expiring after changesStan Hu2015-12-041-7/+5
* | Merge remote-tracking branch 'origin/master' into ce_upstreamValery Sizov2015-12-011-2/+10
|\ \ | |/
| * Expire application settings from cache at startupStan Hu2015-11-251-2/+10
* | Merge remote-tracking branch 'origin/master' into ce_upstreamValery Sizov2015-11-241-1/+1
|\ \ | |/
| * Expose artifacts pathci-artifacts-pathKamil Trzcinski2015-11-231-1/+1
* | Merge remote-tracking branch 'ce/master' into ce-to-eeRobert Speicher2015-11-151-0/+4
|\ \ | |/
| * Annotate modelsDmitriy Zaporozhets2015-11-131-0/+4
* | Merge remote-tracking branch 'ce/master' into ce-to-eeRobert Speicher2015-11-131-2/+10
|\ \ | |/
| * Merge pull request #9825 from huacnlee/cache-application-settingDmitriy Zaporozhets2015-11-131-1/+7
| |\
| | * Add caching for ApplicationSetting, Ci::ApplicationSetting.Jason Lee2015-11-121-1/+7
| * | Implement Build ArtifactsKamil Trzcinski2015-11-101-0/+1
| |/
| * Enable shared runners for all new projectsKamil Trzcinski2015-11-051-1/+2
* | Merge remote-tracking branch 'origin/master' into ce_upstreamValery Sizov2015-10-231-0/+4
|\ \ | |/
| * Validate admin notification email.Douwe Maan2015-10-181-0/+4
* | Merge remote-tracking branch 'origin/master' into ce_upstream_15_10Valery Sizov2015-10-151-2/+1
|\ \ | |/
| * Remove the option to disable CIrs-remove-ci-disableRobert Speicher2015-10-051-2/+1
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-09-221-1/+2
|\ \ | |/
| * Allow to disable GitLab CIKamil Trzcinski2015-09-181-1/+2
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-09-161-1/+1
|\ \ | |/
| * FogBugz project importJared Szechy2015-09-081-1/+1
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-08-261-1/+14
|\ \ | |/
| * Import sources: settings in the admin interfaceArtem Sidorenko2015-08-201-1/+14
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-08-101-2/+3
|\ \ | |/
| * Re-annotate modelsAtsushi Ishida2015-08-031-2/+3
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-06-171-0/+6
|\ \ | |/
| * Ensure `session_expire_delay` field exists before accessing itrs-issue-1798Robert Speicher2015-06-131-4/+4
| * session_expire_seconds => session_expire_delaythemaze752015-06-101-2/+6
| * Add session expiration delay configuration through UI applicationEric Maziade2015-06-051-0/+2
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-06-051-0/+6
|\ \ | |/
| * Allow to configure a URL to show after sign outAlex Lossent2015-05-291-0/+5
| * Add option to disallow users from registering any application to use GitLab a...user-oauth-applicationsDouwe Maan2015-05-291-0/+1
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-eeDouwe Maan2015-05-051-5/+24
|\ \ | |/
| * Re-annotate modelsStan Hu2015-05-031-4/+3
| * Add application setting to restrict user signups to e-mail domainsStan Hu2015-05-021-2/+22
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-04-271-1/+5
|\ \ | |/
| * Add new admin settingsVinnie Okada2015-04-261-1/+5
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-04-151-2/+4
|\ \ | |/
| * Don't use URI.regexp to validate since it doens't have start/end anchors.Douwe Maan2015-04-111-1/+1
| * Support configurable attachment size via Application SettingsStan Hu2015-04-021-1/+3
View Lorry Controller Status