summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-183-0/+6
|\
| * Merge branch 'master' into docker-registry-viewdocker-registry-viewKamil Trzcinski2016-05-181-0/+2
| |\
| * | Fix rubocop offensesKamil Trzcinski2016-05-161-1/+1
| | |
| * | Bring back path to registry settingsKamil Trzcinski2016-05-162-0/+2
| | |
| * | Compact host and portKamil Trzcinski2016-05-161-1/+1
| | |
| * | Bring back port to registry configurationKamil Trzcinski2016-05-161-1/+2
| | |
| * | Use registry.port to construct the registry hostKamil Trzcinski2016-05-161-0/+2
| | |
| * | Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-142-36/+6
| |\ \
| * \ \ Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-1312-96/+60
| |\ \ \
| * \ \ \ Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-121-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-098-31/+62
| |\ \ \ \ \
| * | | | | | WIPKamil Trzcinski2016-05-081-1/+1
| | | | | | |
| * | | | | | Remove unused mime_typesKamil Trzcinski2016-05-041-7/+0
| | | | | | |
| * | | | | | Added docker registry viewKamil Trzcinski2016-05-042-0/+9
| | | | | | |
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-189-38/+68
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/models/note.rb # db/schema.rb # spec/models/note_spec.rb
| * | | | | | Instrument all Grape API helpersYorick Peterse2016-05-171-0/+2
| | | | | | |
| * | | | | | Bring back port to registry configurationdocker-registryKamil Trzcinski2016-05-161-1/+2
| | |_|_|_|/ | |/| | | |
| * | | | | Simplify registry configurationKamil Trzcinski2016-05-142-36/+6
| | |_|_|/ | |/| | |
| * | | | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-1312-96/+60
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | # Conflicts: # config/initializers/1_settings.rb
| | * | | remove extra space to fix codestylerubocop/space-around-operatorsGabriel Mazetto2016-05-131-1/+1
| | | | |
| | * | | Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-135-13/+13
| | | | |
| | * | | Merge branch 'deprecated-class-methods-cop' into 'master' Robert Speicher2016-05-122-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the Rubocop DeprecatedClassMethods cop This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods. See merge request !4087
| | | * | | Enable the Rubocop DeprecatedClassMethods copConnor Shea2016-05-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods.
| | * | | | Merge branch 'health-check-route'Douwe Maan2016-05-122-0/+8
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| | | * | | | Support token header for health check token, and general cleanup of the ↵DJ Mountney2016-05-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | health_check feature.
| | | * | | | Add health_check access token, and enforce on the health_check endpointDJ Mountney2016-05-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added a health check page to the admin section for resetting the token.
| | | * | | | Set the standard health_check options to include the cache check.DJ Mountney2016-05-101-28/+3
| | | | | | |
| | | * | | | Add the health_check gem end expose the health_check routeDJ Mountney2016-05-102-0/+31
| | | | | | |
| | * | | | | Merge branch 'send-incremental-build-log' into 'master' Jacob Schatz2016-05-121-0/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update build log incrementally Proof of concept implementation of incremental sending of build log to browser. cc @jschatz1 @vsizov @grzesiek @tmaczukin See merge request !3737
| | | * \ \ \ \ Merge remote-tracking branch 'origin/master' into send-incremental-build-logKamil Trzcinski2016-05-102-2/+2
| | | |\ \ \ \ \ | | | | |/ / / /
| | | * | | | | Send trace to a browser incrementally when build is runningKamil Trzcinski2016-05-091-0/+1
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | We send a state of ansi2html to client, client needs to send this state back. The state describes the configuration of generator and position within trace.
| | * | | | | Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master' Douwe Maan2016-05-111-18/+14
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add snippet tab under user profile Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15572 See merge request !4001
| | | * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-115-15/+22
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | issue_15572_snippets_tab_under_user_profile
| | | * | | | | | Code improveLong Nguyen2016-05-101-7/+8
| | | | | | | | |
| | | * | | | | | Routing refactoringLong Nguyen2016-05-081-13/+10
| | | | | | | | |
| | | * | | | | | Fix routing errorLong Nguyen2016-05-081-1/+1
| | | | | | | | |
| | | * | | | | | user routings refactorLong Nguyen2016-05-081-20/+17
| | | | | | | | |
| | | * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-0510-31/+95
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | | | | | | | | | issue_15572_snippets_tab_under_user_profile
| | | * | | | | | Add snippet tab under user profileLong Nguyen2016-05-021-2/+3
| | | | | | | | |
| * | | | | | | | Fix CI testsKamil Trzcinski2016-05-121-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Remove unused partsKamil Trzcinski2016-05-092-2/+0
| | | | | | | |
| * | | | | | | Rename `images` to `container_registry`Kamil Trzcinski2016-05-092-6/+7
| | | | | | | |
| * | | | | | | Revert "Eager load `lib/api`"Kamil Trzcinski2016-05-092-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0a280158efeb7f681589ae7af24f0ed9052de809.
| * | | | | | | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-097-21/+54
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Added JWT controllerKamil Trzcinski2016-05-021-0/+3
| | | | | | |
| * | | | | | Eager load `lib/api`Timothy Andrew2016-04-292-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - So that the server doesn't have to be restarted for every change in dev.
| * | | | | | Auth tokenKamil Trzcinski2016-04-292-0/+11
| | | | | | |
| * | | | | | Added authentication service for docker registryKamil Trzcinski2016-04-291-0/+39
| | | | | | |
* | | | | | | Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-114-61/+20
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Remove Rails monkey-patches now that we're using Rails 4.2.6Rémy Coutable2016-05-111-48/+0
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status