summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-037-8/+13
|\
| * Attempt to fix the user page.Connor Shea2016-06-011-1/+2
| * Remove d3 except for on pages where it's necessary.Connor Shea2016-06-011-0/+1
| * 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-space-before-comma-cop' into 'master' Robert Speicher2016-05-301-2/+6
| |\ \
| | * | Enable Style/SpaceBeforeComma rubocop coprubocop/enable-space-before-comma-copGrzegorz Bizon2016-05-301-2/+6
| | |/
| * | 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
| |/
* | Incorportate feedbackZ.J. van de Weg2016-06-011-1/+0
* | Merge branch 'master' into awardablesZJ van de Weg2016-05-305-2/+5
|\ \ | |/
| * Merge branch 'move-project-dropdown-async' into 'master' Jacob Schatz2016-05-261-0/+1
| |\
| | * Loads move issue dropdown asyncPhil Hughes2016-05-161-0/+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
| * | | New confirmation email :fire:Robert Speicher2016-05-251-1/+1
| * | | Customize ActionMailer preview pathRobert Speicher2016-05-251-0/+1
| |/ /
* | | Merge branch 'master' into awardablesZJ van de Weg2016-05-253-6/+16
|\ \ \ | |/ /
| * | Add proper config values for Registry in gitlab.ymlAchilleas Pipinellis2016-05-221-4/+4
| * | Merge branch 'fix-generator-templates-directory' into 'master' Jeroen van Baarsen2016-05-191-1/+3
| |\ \
| | * | Move generator templates to generator_templates/Yorick Peterse2016-05-191-1/+3
| * | | Merge branch '17464-backport-email-syntax-highlighting' into 'master' Douwe Maan2016-05-191-0/+1
| |\ \ \
| | * | | Syntax-highlight diffs in push emails17464-backport-email-syntax-highlightingSean McGivern2016-05-171-0/+1
| * | | | Merge branch 'with-pipeline-view' into 'master' Douwe Maan2016-05-191-0/+7
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-163-6/+29
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-1312-96/+60
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-0910-31/+95
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-04-266-7/+28
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'ci-commit-as-pipeline' into with-pipeline-viewKamil Trzcinski2016-04-135-3/+40
| | |\ \ \ \ \ \ \
| | * | | | | | | | Pipeline viewKamil Trzcinski2016-04-131-1/+1
| | * | | | | | | | WIPKamil Trzcinski2016-04-131-0/+7
| * | | | | | | | | Merge branch 'project-variables-ui' into 'master' Jacob Schatz2016-05-191-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Project variables UIPhil Hughes2016-05-161-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' 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