summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Change logic of repo name and slugs in docs review scriptsimplify-docs-review-scriptAchilleas Pipinellis2017-11-161-11/+24
| | | | | | We need to make room for Runner and Omnibus docs. This change makes sure the correct values are defined based on CI_PROJECT_NAME.
* 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
| | | | | | | | |
* | | | | | | | | 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 instead See merge request gitlab-org/gitlab-ce!15280
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable UnnecessaryMantissa in scss-lint See merge request gitlab-org/gitlab-ce!15255
| * | | | | | | | | Enable UnnecessaryMantissa in scss-lintTakuya Noguchi2017-11-096-10/+15
| | | | | | | | | |
* | | | | | | | | | Merge branch 'bvl-fork-network-memberships-for-deleted-source' into 'master'Yorick Peterse2017-11-143-2/+24
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to create fork network memberships for forks of forks Closes #40072 See merge request gitlab-org/gitlab-ce!15366
| * | | | | | | | | Don't try to create fork network memberships for forks of forksbvl-fork-network-memberships-for-deleted-sourceBob Van Landuyt2017-11-143-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case the root project of a Fork-of-fork is deleted, the ForkNetwork and the membership for that fork network is never created. In this case we shouldn't try to create the membership, since the parent membership will never be created. This means that these fork networks will be lost.
* | | | | | | | | | Merge branch 'issue_40058' into 'master'Sean McGivern2017-11-143-1/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent position update for image diff notes Closes #40058 See merge request gitlab-org/gitlab-ce!15357
| * | | | | | | | | | Prevents position update for image diff notesissue_40058Felipe Artur2017-11-133-1/+13
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
View Lorry Controller Status