summaryrefslogtreecommitdiff
path: root/config/initializers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gitlab-auth-method-names' into 'master' Douwe Maan2016-06-131-1/+1
|\
| * Improve Gitlab::Auth method namesJacob Vosmaer2016-06-101-1/+1
* | Instrument all Banzai::ReferenceParser classesinstrument-reference-parsersYorick Peterse2016-06-131-6/+11
|/
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-06-082-0/+11
|\
| * Instrument `RepositoryCheck::SingleRepositoryWorker` manuallyAlejandro Rodríguez2016-06-071-0/+7
| * Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-035-6/+5
| |\
| * \ Merge branch 'master' into awardablesZJ van de Weg2016-05-302-1/+2
| |\ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-181-0/+3
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-185-17/+33
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-113-52/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-117-19/+61
| |\ \ \ \ \ \
| * | | | | | | Create table for award emojiZeger-Jan van de Weg2016-05-061-0/+4
* | | | | | | | Rename finder to find_in_gitlab_or_ldapJacob Vosmaer2016-06-021-1/+1
* | | | | | | | Merge branch 'master' into git-http-controllerJacob Vosmaer2016-06-0216-93/+106
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'upgrade-devise-two-factor' into 'master' Robert Speicher2016-06-021-1/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Upgrade devise and devise-two-factor, remove devise-asyncConnor Shea2016-05-301-1/+0
| * | | | | | | | Merge branch 'issue_15557' into 'master' Rémy Coutable2016-06-012-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Add leading comment space copissue_15557Felipe Artur2016-05-312-3/+3
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'rubocop/enable-negatedif-style-cop' into 'master' Robert Speicher2016-05-301-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Enable Style/NegatedIf Rubocop coprubocop/enable-negatedif-style-copGrzegorz Bizon2016-05-301-1/+1
| | |/ / / / / /
| * | | | | | | Merge branch 'rubocop/enable-redundant-parentheses-cop' into 'master' Robert Speicher2016-05-301-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Enable Style/RedundantParentheses rubocop coprubocop/enable-redundant-parentheses-copGrzegorz Bizon2016-05-301-1/+1
| | |/ / / / / /
| * | | | | | | Enable Style/SpaceBeforeComment rubocop coprubocop/enable-space-before-comment-copGrzegorz Bizon2016-05-301-1/+1
| |/ / / / / /
| * | | | | | Merge branch 'measure-proxy-timing' into 'master' Yorick Peterse2016-05-261-0/+1
| |\ \ \ \ \ \
| | * | | | | | Rename metric to 'rails queue duration'Jacob Vosmaer2016-05-261-1/+1
| | * | | | | | Align class name with field nameJacob Vosmaer2016-05-251-1/+1
| | * | | | | | Couple ProxyTiming to Metrics middlewareJacob Vosmaer2016-05-252-1/+1
| | * | | | | | Measure proxy timing: needs influxdb codeJacob Vosmaer2016-05-241-0/+1
| * | | | | | | Don't remove IDs via premailerRobert Speicher2016-05-251-1/+1
| |/ / / / / /
| * | | | | | Revert "Merge branch 'issues/15127' into 'master'"revert-3656b5dbStan Hu2016-05-191-1/+0
| * | | | | | Merge branch 'issues/15127' into 'master' Stan Hu2016-05-191-0/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | fix #15127 ActiveJob::DeserializationError thrownP.S.V.R2016-04-111-0/+1
| * | | | | | Merge branch 'master' into docker-registry-viewdocker-registry-viewKamil Trzcinski2016-05-181-0/+2
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Instrument all Grape API helpersYorick Peterse2016-05-171-0/+2
| * | | | | | Fix rubocop offensesKamil Trzcinski2016-05-161-1/+1
| * | | | | | Bring back path to registry settingsKamil Trzcinski2016-05-161-0/+1
| * | | | | | Compact host and portKamil Trzcinski2016-05-161-1/+1
| * | | | | | Use registry.port to construct the registry hostKamil Trzcinski2016-05-161-0/+2
| |/ / / / /
| * | | | | Simplify registry configurationKamil Trzcinski2016-05-141-33/+5
| * | | | | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-137-65/+21
| |\ \ \ \ \
| | * | | | | Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-133-11/+11
| | * | | | | Merge branch 'deprecated-class-methods-cop' into 'master' Robert Speicher2016-05-121-1/+1
| | |\ \ \ \ \
| | | * | | | | Enable the Rubocop DeprecatedClassMethods copConnor Shea2016-05-081-1/+1
| | * | | | | | Merge branch 'health-check-route'Douwe Maan2016-05-121-0/+3
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Support token header for health check token, and general cleanup of the healt...DJ Mountney2016-05-111-1/+1
| | | * | | | | 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-101-0/+28
| | | | |_|_|/ | | | |/| | |
| | * | | | | Remove Rails monkey-patches now that we're using Rails 4.2.6Rémy Coutable2016-05-111-48/+0
| | * | | | | Fix a few places where autoloading would failRémy Coutable2016-05-102-4/+4
| | |/ / / /
| | * | | | Merge branch 'trusted-proxies-ip-addr' into 'master' Rémy Coutable2016-05-091-1/+2
| | |\ \ \ \ | | | |/ / / | | |/| | |
View Lorry Controller Status