summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add an attributes bag class as a GitalyClient helperfix/add-attributes-bag-class-to-gitaly-clientAhmad Sherif2017-11-155-32/+39
|
* Merge branch ↵Sean McGivern2017-11-151-3/+3
|\ | | | | | | | | | | | | | | | | '40186-the-ee_compat_check-job-sometimes-fail-on-the-git-apply-3way-step-for-forks' into 'master' Always fetch master from the canonical remote Closes #40186 See merge request gitlab-org/gitlab-ce!15399
| * Always fetch master from the canonical remoteRémy Coutable2017-11-151-3/+3
| | | | | | | | | | | | | | | | This way, if a fork's master branch is far behind the canonical's master, it won't use the tip of the fork's master branch as merge base and thus won't create a huge and wrong patch file. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'fix-typo' into 'master'Sean McGivern2017-11-151-1/+1
|\ \ | |/ |/| | | | | fix typo See merge request gitlab-org/gitlab-ce!15374
| * Update getting_started_part_one.mdChế Tiệp Chân Khoa2017-11-141-1/+1
| |
* | 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 service See merge request gitlab-org/gitlab-ce!15397
| * | 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.1 See merge request gitlab-org/gitlab-ce!15371
| * | | 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 10 Closes gitlab-qa#103 See merge request gitlab-org/gitlab-ce!15382
| * | | | Raise the QA Capybara's default wait time from 4 to 10rs-qa-default-timeoutRobert Speicher2017-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | We were seeing intermittent failures on CI due to slow responses from certain endpoints.
* | | | | Merge branch 'update-merge-worker-metrics' into 'master'Sean McGivern2017-11-153-1/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add simple logging to UpdateMergeRequestsWorker#perform See merge request gitlab-org/gitlab-ce!15360
| * | | | | [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
| | | | | | | | | | | | | | | | | | | | | | | | this is to try to debug #35914
* | | | | | Merge branch 'ce-backport-39009-fix-approvals-showing-up-in-empty-mr-widget' ↵Phil Hughes2017-11-152-10/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Remove approvals when in empty MR widget state -- CE backport See merge request gitlab-org/gitlab-ce!15362
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3376
* | | | | | | Merge branch ↵Phil Hughes2017-11-153-18/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33338-internationalization-support-for-prometheus-service-configuration' into 'master' Resolve "Internationalization support for Prometheus Service Configuration" Closes #33338 See merge request gitlab-org/gitlab-ce!15336
| * | | | | | | 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' See merge request gitlab-org/gitlab-ce!15385
| * | | | | | | Replace 'charts' with 'chart'Nestor Pestelos2017-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto DevOps' gitlab-ci.yml expects a directory named 'chart'. See also: https://gitlab.com/gitlab-org/gitlab-ci-yml/merge_requests/114
* | | | | | | | Merge branch '38007-update-licensing-docs' into 'master'Achilleas Pipinellis2017-11-151-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update licensing docs to clarify process for node modules Closes #38007 See merge request gitlab-org/gitlab-ce!14575
| * | | | | | | | update licensing docs to mention that we check node_modules for license ↵38007-update-licensing-docsMike Greiling2017-09-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | information as well
* | | | | | | | | 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 header Closes #40161 See merge request gitlab-org/gitlab-ce!15389
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | skip_gitaly_mock disables Gitaly in specs See merge request gitlab-org/gitlab-ce!15383
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set owner
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include child projects a user can manage in namespace dropdowns Closes #39987 See merge request gitlab-org/gitlab-ce!15294
| * | | | | | | | | | Guarantee the order of groups in the dropdownbvl-subgroup-in-dropdownsBob Van Landuyt2017-11-141-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So the groups with the same parent are listed together. The recursive cte seemed to do it by itself, but it is not guaranteed. By ordering on the `route.path` that includes every parent group, we can assume they're going to be in the right order.
| * | | | | | | | | | Include child projects a user can manage in namespace dropdownsBob Van Landuyt2017-11-148-10/+157
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | These dropdown options are used for creating and transfering projects.
* | | | | | | | | | Merge branch 'update-metrics-for-k8s-1.7' into 'master'Tim Zallmann2017-11-142-8/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update queries to remove duplicate entries (CE version) See merge request gitlab-org/gitlab-ce!15254
| * | | | | | | | | | 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 typo See merge request gitlab-org/gitlab-ce!15358
| * | | | | | | | | | Fix typofix-typoClement Ho2017-11-131-1/+1
| | | | | | | | | | |