summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Changelog39573-hashed-storage-backupGabriel Mazetto2017-11-151-0/+5
* Fix dumping hashed storage based repositoryGabriel Mazetto2017-11-153-9/+21
* Merge branch 'dm-import-service-polymorphism' into 'master'40186-the-ee_compat_check-job-sometimes-fail-on-the-git-apply-3way-step-for-forksYorick Peterse2017-11-154-15/+19
|\
| * Prefer polymorphism over specific type checks in Import servicedm-import-service-polymorphismDouwe Maan2017-11-154-15/+19
* | Merge branch 'workhorse-3-3-1' into 'master'Rémy Coutable2017-11-151-1/+1
|\ \
| * | Update gitlab-workhorse to v3.3.1Nick Thomas2017-11-141-1/+1
* | | Merge branch 'rs-qa-default-timeout' into 'master'Grzegorz Bizon2017-11-151-1/+1
|\ \ \
| * | | Raise the QA Capybara's default wait time from 4 to 10rs-qa-default-timeoutRobert Speicher2017-11-141-1/+1
* | | | Merge branch 'update-merge-worker-metrics' into 'master'Sean McGivern2017-11-153-1/+34
|\ \ \ \
| * | | | [ci-skip] lintingupdate-merge-worker-metricsMicael Bergeron2017-11-141-1/+0
| * | | | rework the logging to be simpler and add a thresholdmicael.bergeron2017-11-142-9/+21
| * | | | [ci-skip] add changelogGitLab Development2017-11-131-0/+5
| * | | | add simple logging to UpdateMergeRequestsWorker#performmicael.bergeron2017-11-132-1/+18
* | | | | Merge branch 'ce-backport-39009-fix-approvals-showing-up-in-empty-mr-widget' ...Phil Hughes2017-11-152-10/+11
|\ \ \ \ \
| * | | | | Backport spec changes from EE remove approvals in empty statece-backport-39009-fix-approvals-showing-up-in-empty-mr-widgetEric Eastwood2017-11-132-10/+11
* | | | | | Merge branch '33338-internationalization-support-for-prometheus-service-confi...Phil Hughes2017-11-153-18/+20
|\ \ \ \ \ \
| * | | | | | Resolve "Internationalization support for Prometheus Service Configuration"Jose Ivan Vargas Lopez2017-11-153-18/+20
|/ / / / / /
* | | | | | Merge branch 'patch-2' into 'master'Achilleas Pipinellis2017-11-151-1/+1
|\ \ \ \ \ \
| * | | | | | Replace 'charts' with 'chart'Nestor Pestelos2017-11-151-1/+1
* | | | | | | Merge branch '38007-update-licensing-docs' into 'master'Achilleas Pipinellis2017-11-151-3/+3
|\ \ \ \ \ \ \
| * | | | | | | update licensing docs to mention that we check node_modules for license infor...38007-update-licensing-docsMike Greiling2017-09-291-3/+3
* | | | | | | | Merge branch '40161-extra-margin-on-svg-logo-in-header' into 'master'Annabel Dunstone Gray2017-11-152-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | 40161 Remove extra margin from wordmark in header40161-extra-margin-on-svg-logo-in-headertauriedavis2017-11-142-1/+6
* | | | | | | | | Merge branch 'gitaly-fix-broken-specs' into 'master'Robert Speicher2017-11-141-2/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | we need to disable gitaly for some testsKim "BKC" Carlbäcker2017-11-141-2/+6
* | | | | | | | | Update CHANGELOG.md for 10.1.4Felipe Artur2017-11-145-21/+10
* | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqFelipe Artur2017-11-140-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch dev/master into masterFelipe Artur2017-11-140-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Prevent error when authorizing an admin-created OAauth application without a ...Douwe Maan2017-11-132-5/+14
| * | | | | | | | Move update_project_counter_caches? out of issue and merge requestGeorge Andrinopoulos2017-11-137-39/+14
| * | | | | | | | Add externalized stringsGeorge Andrinopoulos2017-11-132-4/+4
| * | | | | | | | Add feature test to milestoneGeorge Andrinopoulos2017-11-132-0/+35
| * | | | | | | | Move total time spend calculation to milestoneishGeorge Andrinopoulos2017-11-137-77/+24
| * | | | | | | | Fix static code analysis offenceGeorge Andrinopoulos2017-11-131-1/+1
| * | | | | | | | Fix collapsed sidebar messages and iconGeorge Andrinopoulos2017-11-135-6/+18
| * | | | | | | | Add total time spent to milestonesGeorge Andrinopoulos2017-11-135-0/+82
* | | | | | | | | Merge branch 'bvl-subgroup-in-dropdowns' into 'master'Sean McGivern2017-11-148-11/+161
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Guarantee the order of groups in the dropdownbvl-subgroup-in-dropdownsBob Van Landuyt2017-11-141-2/+5
| * | | | | | | | | Include child projects a user can manage in namespace dropdownsBob Van Landuyt2017-11-148-10/+157
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'update-metrics-for-k8s-1.7' into 'master'Tim Zallmann2017-11-142-8/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Uodate docsupdate-metrics-for-k8s-1.7Joshua Lambert2017-11-121-2/+2
| * | | | | | | | | Change label to be more consistent, not a series.Joshua Lambert2017-11-121-4/+2
| * | | | | | | | | Fix CPU metricJoshua Lambert2017-11-121-2/+2
| * | | | | | | | | Fix to use variableJoshua Lambert2017-11-121-1/+1
| * | | | | | | | | Adjust metrics to ignore Job tag to support k8s 1.7+Joshua Lambert2017-11-121-2/+2
* | | | | | | | | | Merge branch 'fix-typo' into 'master'Annabel Dunstone Gray2017-11-141-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Fix typofix-typoClement Ho2017-11-131-1/+1
* | | | | | | | | | Merge branch '32098-pipelines-navigation' into 'master'38962-automatically-run-a-pipeline-when-auto-devops-is-turned-on-in-project-settingsPhil Hughes2017-11-1412-252/+385
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Stops page reload when changing tabs or pages - uses API requests insteadFilipa Lacerda2017-11-1412-252/+385
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'enable-scss-lint-unnecessary-mantissa' into 'master'Clement Ho2017-11-146-10/+15
|\ \ \ \ \ \ \ \ \ \