summaryrefslogtreecommitdiff
path: root/app/controllers/admin/application_settings_controller.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into ce_upstreamValery Sizov2015-12-251-0/+2
|\
| * Add to application_settings forced TFA optionsGabriel Mazetto2015-12-241-0/+2
* | Add GitLab PagesKamil Trzcinski2015-12-181-0/+1
* | Merge remote-tracking branch 'ce/master' into ce-to-eeRobert Speicher2015-12-151-0/+6
|\ \ | |/
| * Use a new admin runners path when reseting runners tokenGrzegorz Bizon2015-12-141-1/+1
| * Add CI runners registration token reset buttonGrzegorz Bizon2015-12-111-0/+6
* | Merge remote-tracking branch 'ce/master' into ce-to-eeRobert Speicher2015-11-131-0/+2
|\ \ | |/
| * Implement Build ArtifactsKamil Trzcinski2015-11-101-0/+1
| * Enable shared runners for all new projectsKamil Trzcinski2015-11-051-0/+1
* | Merge remote-tracking branch 'origin/master' into ce_upstreamValery Sizov2015-10-231-0/+1
|\ \ | |/
| * Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-181-1/+0
| |\
| * | Send an email (to support) when a user is reported for spamJonathan Rochkind2015-10-081-0/+1
* | | Merge remote-tracking branch 'origin/master' into ce_upstream_15_10Valery Sizov2015-10-151-1/+0
|\ \ \ | | |/ | |/|
| * | Remove the option to disable CIrs-remove-ci-disableRobert Speicher2015-10-051-1/+0
| |/
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-09-221-0/+2
|\ \ | |/
| * Allow to disable GitLab CIKamil Trzcinski2015-09-181-0/+1
| * Allow custom info to be added to Help pageJeroen van Baarsen2015-09-181-0/+1
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-08-261-0/+10
|\ \ | |/
| * Import sources: settings in the admin interfaceArtem Sidorenko2015-08-201-0/+10
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-06-171-0/+1
|\ \ | |/
| * session_expire_seconds => session_expire_delaythemaze752015-06-101-1/+1
| * Add session expiration delay configuration through UI applicationEric Maziade2015-06-051-0/+1
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-06-051-0/+2
|\ \ | |/
| * Allow to configure a URL to show after sign outAlex Lossent2015-05-291-0/+1
| * 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 dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-05-151-0/+1
|\ \ | |/
| * Fix syntax errorDmitriy Zaporozhets2015-05-081-1/+1
| * Merge branch 'version-check' into gl-version-checkDmitriy Zaporozhets2015-05-081-0/+1
| |\
| | * Add feature to disable version checkDmitriy Zaporozhets2015-03-101-1/+2
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-eeDouwe Maan2015-05-051-1/+2
|\ \ \ | |/ /
| * | Add application setting to restrict user signups to e-mail domainsStan Hu2015-05-021-1/+2
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-04-271-0/+2
|\ \ \ | |/ /
| * | Add new admin settingsVinnie Okada2015-04-261-0/+2
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-04-241-1/+1
|\ \ \ | |/ /
| * | Fixed the Rails/ActionFilter copJeroen van Baarsen2015-04-201-1/+1
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-04-151-0/+1
|\ \ \ | |/ /
| * | Support configurable attachment size via Application SettingsStan Hu2015-04-021-0/+1
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-03-161-1/+11
|\ \ \ | |/ /
| * | Fix restricted visibility bugsVinnie Okada2015-03-161-1/+3
| * | Move restricted visibility settings to the UIVinnie Okada2015-03-071-1/+9
| |/
* | Add help_text to help text, login and static error pages.Marin Jankovski2015-02-261-1/+2
|/
* Add link to share via twitter to "created project" event.Douwe Maan2015-02-131-0/+1
* Allow configuring protection of the default branch upon first pushMarco Wessel2015-01-251-0/+1
* Allow to specify home page for non logged-in usersDmitriy Zaporozhets2015-01-161-0/+1
* Create ApplicationSettings if does not exist in runtimeDmitriy Zaporozhets2015-01-081-1/+1
* Improve application settings and write testsDmitriy Zaporozhets2015-01-081-6/+6
* Init ApplicationSettings resource with defaults from config fileDmitriy Zaporozhets2015-01-081-0/+31
View Lorry Controller Status