summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-incoming-email-default' into 'master'Robert Speicher2015-11-091-2/+2
* Merge branch 'facebook-auth' into 'master' Robert Speicher2015-11-041-11/+12
* Merge branch 'remove-satellites' into 'master' Robert Speicher2015-10-262-3/+7
* Merge branch 'view-issue-performance'Dmitriy Zaporozhets2015-10-154-1/+43
|\
| * Fixed Rubocop styling issuesYorick Peterse2015-10-151-4/+4
| * Added rack-lineprof for developmentYorick Peterse2015-10-152-1/+32
| * Added active_record_query_traceYorick Peterse2015-10-151-0/+5
| * Added Bullet to the GemfileYorick Peterse2015-10-151-0/+6
* | Merge branch 'builds-view' into 'master' Kamil Trzciński2015-10-151-1/+5
|\ \
| * | Fix cancel_all specsKamil Trzcinski2015-10-141-1/+1
| * | Added builds viewKamil Trzcinski2015-10-141-1/+5
* | | Merge branch 'fix-path-with-leading-dot-error' into 'master' Dmitriy Zaporozhets2015-10-151-1/+3
|\ \ \ | |_|/ |/| |
| * | Fix error preventing displaying of commit data for a directory with a leading...Stan Hu2015-10-121-1/+3
* | | Shut up, RubocopRobert Speicher2015-10-141-1/+1
* | | Add defaults for incoming_email ssl and start_tls.incoming-email-configDouwe Maan2015-10-141-4/+6
* | | Make Reply by email easier to configureDouwe Maan2015-10-134-41/+65
| |/ |/|
* | Enable arbitration in MailRoomDouwe Maan2015-10-111-1/+11
|/
* Use `methods: :any` in our rack-cors configurationrs-update-rack-corsRobert Speicher2015-10-071-1/+1
* Merge branch 'clarify-postfix' into 'master' Robert Speicher2015-10-071-1/+1
|\
| * Clarify Reply by email settings when using Postfix mail serverclarify-postfixDouwe Maan2015-10-071-1/+1
* | Merge branch 'cleanup-ci-pages' into 'master' Dmitriy Zaporozhets2015-10-071-22/+14
|\ \
| * | Fix tests and few CI featuresDmitriy Zaporozhets2015-10-071-1/+1
| * | Move CI services to project settings areaDmitriy Zaporozhets2015-10-071-6/+6
| * | Remove Ci::Commit and Ci::Build controllerscleanup-ci-pagesDmitriy Zaporozhets2015-10-071-16/+8
| |/
* | Add directory feature buttonStan Hu2015-10-071-0/+9
|/
* Cleanup CI code after refactoring and fix several 500 errorsDmitriy Zaporozhets2015-10-061-4/+2
* Move CI build page to CE projectDmitriy Zaporozhets2015-10-061-0/+2
* Render CI statuses on commit pageDmitriy Zaporozhets2015-10-061-1/+4
* Merge branch 'rs-remove-ci-disable'Kamil Trzcinski2015-10-051-1/+0
|\
| * Remove the option to disable CIrs-remove-ci-disableRobert Speicher2015-10-051-1/+0
* | Merge branch 'refactor-build-service' into 'master' Kamil Trzciński2015-10-051-6/+4
|\ \ | |/ |/|
| * Refactor commit and buildKamil Trzcinski2015-10-051-6/+4
* | Move CI web hooks page to project settings areaDmitriy Zaporozhets2015-10-051-6/+5
|/
* Merge branch 'rs-throttle-reset' into 'master' Douwe Maan2015-10-021-51/+53
|\
| * Add recently_reset message to Devise translationsRobert Speicher2015-10-011-0/+1
| * Update config/locales/devise.en.yml with latest versionRobert Speicher2015-10-011-51/+52
* | Merge branch 'ee_features_in_example_config' into 'master' Dmitriy Zaporozhets2015-10-011-1/+0
|\ \ | |/ |/|
| * Removes reference to Enterprise Edition ssh key sync feature.Ted Strzalkowski2015-07-211-1/+0
* | Take advantage of `Devise.sign_in_after_reset_password`rs-disable-signin-after-resetRobert Speicher2015-09-301-0/+4
* | Move CI project settings page to CE project settings areamove-ci-settingsDmitriy Zaporozhets2015-09-291-0/+1
* | Merge branch 'move-triggers-page' into 'master' Dmitriy Zaporozhets2015-09-291-2/+1
|\ \
| * | Move CI triggers page to project settings areamove-triggers-pageDmitriy Zaporozhets2015-09-291-2/+1
* | | Merge branch 'master' into 'master' Jacob Vosmaer2015-09-292-14/+17
|\ \ \ | |/ / |/| |
| * | Add support for AWS S3 Server-Side Encryption supportPaul Beattie2015-09-252-14/+17
* | | Move CI variables page to project settingsmove-variables-pageDmitriy Zaporozhets2015-09-281-1/+1
* | | Merge branch 'move-runners-page'Dmitriy Zaporozhets2015-09-281-8/+7
|\ \ \
| * | | Move runners page to project settingsDmitriy Zaporozhets2015-09-251-8/+7
| |/ /
* | | Merge branch 'fxposter/gitlab-ce-login-from-admin'Douwe Maan2015-09-281-0/+1
|\ \ \ | |/ / |/| |
| * | Move login button to user page, switched to POST methodPavel Forkert2015-09-241-1/+1
| * | Add option to admin area to sign in as a specific userPavel Forkert2015-09-241-0/+1
View Lorry Controller Status