summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'artifacts' into 'master' Kamil Trzciński2015-11-112-0/+2
|\
| * Final fixesKamil Trzcinski2015-11-101-1/+1
| * Implement Build ArtifactsKamil Trzcinski2015-11-102-0/+2
* | Merge branch 'state-machine-to-state-machines-activerecord' into 'master' Dmitriy Zaporozhets2015-11-101-9/+0
|\ \ | |/ |/|
| * remove state_machine_patch.rbPirate Praveen2015-11-091-9/+0
| * Switch to state_machines-activerecord (Fixes: #3374)Pirate Praveen2015-11-081-1/+1
* | Merge remote-tracking branch 'origin/release-notes'Dmitriy Zaporozhets2015-11-101-1/+4
|\ \
| * | Create show page for tag and render release notes there and on index pageDmitriy Zaporozhets2015-11-051-2/+2
| * | More release related logic to separate resourceDmitriy Zaporozhets2015-11-051-1/+4
| * | Add edit/update tag actions for future release notesDmitriy Zaporozhets2015-11-051-1/+1
* | | Merge branch 'fix-incoming-email-default' into 'master' Robert Speicher2015-11-091-2/+2
|\ \ \
| * | | Fix incoming email config defaultsfix-incoming-email-defaultDouwe Maan2015-11-091-2/+2
* | | | Track the amount of times views are renderedYorick Peterse2015-11-091-0/+1
* | | | Added Sherlock, a custom profiling tool for GitLabYorick Peterse2015-11-094-10/+54
|/ / /
* | | Enable shared runners for all new projectsKamil Trzcinski2015-11-051-4/+5
| |/ |/|
* | CI details cleanupKamil Trzcinski2015-11-051-4/+5
|/
* Merge branch 'facebook-auth' into 'master' Robert Speicher2015-11-041-11/+12
|\
| * Add Facebook authenticationDouwe Maan2015-11-031-11/+12
* | Replace all usages of `git` command with configurable binary pathrs-git-bin-pathRobert Speicher2015-11-031-3/+3
|/
* Remove inflector rule that makes commits uncountableDmitriy Zaporozhets2015-11-031-21/+0
* Merge branch 'shared-file-access' into 'master' Dmitriy Zaporozhets2015-10-292-1/+9
|\
| * Start putting shared files in "shared"Jacob Vosmaer2015-10-262-1/+9
* | Remove deprecated CI events from project settings pageDmitriy Zaporozhets2015-10-281-2/+0
* | Remove the contents of the satellites dirremove-satellitesJacob Vosmaer2015-10-232-3/+7
|/
* Merge branch 'master' into remove-forks-from-projects-settingsHan Loong Liauw2015-10-179-34/+118
|\
| * 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
| |/
* | Made suggested content changes based on MR ReviewHan Loong Liauw2015-10-141-1/+1
* | Adds ability to remove the forked relationshipHan Loong Liauw2015-10-131-0/+1
|/
* 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
View Lorry Controller Status