Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update prometheus.yml to reflect current Omnibus version41796-update-auto-deployed-prometheus-scrape-config | Joshua Lambert | 2018-01-15 | 1 | -119/+81 |
* | Merge branch '41799-managed-prometheus-deployment-install-a-lot-of-extra-stuf... | Kamil Trzciński | 2018-01-15 | 5 | -38/+105 |
|\ | |||||
| * | Resolve "Managed Prometheus deployment installs a lot of extra stuff" | Mayra Cabrera | 2018-01-15 | 5 | -38/+105 |
|/ | |||||
* | Merge branch 'stop-gitaly-atexit' into 'master' | Rémy Coutable | 2018-01-15 | 2 | -9/+3 |
|\ | |||||
| * | Use an at_exit hook to stop test gitalystop-gitaly-atexit | Jacob Vosmaer | 2018-01-15 | 2 | -9/+3 |
* | | Merge branch 'docs-fix-duplicate-sections' into 'master' | Achilleas Pipinellis | 2018-01-15 | 1 | -11/+12 |
|\ \ | |||||
| * | | move sections for better doc flow | Marcia Ramos | 2018-01-15 | 1 | -11/+11 |
| * | | link to admin doc | Marcia Ramos | 2018-01-15 | 1 | -0/+1 |
* | | | Merge branch '38540-ssh-env-file' into 'master' | Douwe Maan | 2018-01-15 | 2 | -10/+6 |
|\ \ \ | |||||
| * | | | Remove .ssh/environment file that now breaks the gitlab:check rake task | Ricketts, M (Mike) | 2017-12-22 | 2 | -10/+6 |
* | | | | Merge branch 'projects-tree-tags-dispatcher-refactor' into 'master' | Phil Hughes | 2018-01-15 | 3 | -12/+31 |
|\ \ \ \ | |||||
| * | | | | refactored use of for projects:tree:*projects-tree-tags-dispatcher-refactor | Constance Okoghenun | 2018-01-15 | 2 | -5/+3 |
| * | | | | Refactored import of projects:tags:* and projects:tree:* of dispatcher.js | Constance Okoghenun | 2018-01-15 | 3 | -12/+33 |
* | | | | | Merge branch 'feature/bump-gitaly-version-to-0-69-0' into 'master' | Sean McGivern | 2018-01-15 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Bump Gitaly version to 0.69.0 | Ahmad Sherif | 2018-01-15 | 2 | -2/+2 |
* | | | | | | Merge branch '41856-backport-stacked-progress-bar' into 'master' | Phil Hughes | 2018-01-15 | 4 | -0/+259 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove changelog entry41856-backport-stacked-progress-bar | Kushal Pandya | 2018-01-15 | 1 | -5/+0 |
| * | | | | | | Add changelog entry | Kushal Pandya | 2018-01-15 | 1 | -0/+5 |
| * | | | | | | Add StackedProgressBar Component | Kushal Pandya | 2018-01-15 | 1 | -0/+1 |
| * | | | | | | StackedProgressBar Component styles | Kushal Pandya | 2018-01-15 | 1 | -0/+54 |
| * | | | | | | StackedProgressBar Component tests | Kushal Pandya | 2018-01-15 | 1 | -0/+77 |
| * | | | | | | StackedProgressBar Component | Kushal Pandya | 2018-01-15 | 1 | -0/+127 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'docs-move-article-undo-git' into 'master' | Achilleas Pipinellis | 2018-01-15 | 6 | -498/+499 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Docs: move article "Undo possibilities in Git" into its topic-related dir | Marcia Ramos | 2018-01-15 | 6 | -498/+499 |
|/ / / / / | |||||
* | | | | | Merge branch '42025-fix-issue-api' into 'master' | Sean McGivern | 2018-01-15 | 3 | -2/+18 |
|\ \ \ \ \ | |||||
| * | | | | | [API] Fix creating issue when assignee_id is empty42025-fix-issue-api | Valery Sizov | 2018-01-15 | 3 | -2/+18 |
* | | | | | | Merge branch '41970-job-play-button' into 'master' | Kamil Trzciński | 2018-01-15 | 3 | -9/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove extra period41970-job-play-button | Filipa Lacerda | 2018-01-12 | 1 | -1/+1 |
| * | | | | | | Improve tests | Filipa Lacerda | 2018-01-12 | 1 | -2/+6 |
| * | | | | | | Sets method post for playing action | Filipa Lacerda | 2018-01-12 | 3 | -8/+12 |
* | | | | | | | Merge branch 'docs/sast-dast' into 'master' | Marcia Ramos | 2018-01-15 | 4 | -3/+137 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Add DAST to Auto DevOps docsdocs/sast-dast | Achilleas Pipinellis | 2018-01-15 | 1 | -3/+34 |
| * | | | | | | Port the SAST DAST doc examples from EE to CE | Achilleas Pipinellis | 2018-01-12 | 3 | -0/+103 |
* | | | | | | | Merge branch 'fix-duplication-circuit-breakers' into 'master' | Douwe Maan | 2018-01-15 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Fix duplication in API::CircuitBreakers | Serdar Dogruyol | 2018-01-15 | 1 | -2/+2 |
* | | | | | | | Merge branch 'dispatcher-projects-efi' into 'master' | Phil Hughes | 2018-01-15 | 10 | -37/+114 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into dispatcher-proj... | Simon Knox | 2018-01-15 | 25 | -108/+365 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | dedupe | Simon Knox | 2018-01-15 | 3 | -26/+20 |
| * | | | | | | | removed unneeded lint commentsdispatcher-projects-efi | Simon Knox | 2018-01-15 | 1 | -2/+2 |
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into dispatcher-proj... | Simon Knox | 2018-01-15 | 91 | -919/+1180 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| * | | | | | | | fix tests from broken imports | Simon Knox | 2018-01-12 | 4 | -7/+9 |
| * | | | | | | | dynamic imports for projects:e/f/i | Simon Knox | 2018-01-12 | 9 | -29/+120 |
* | | | | | | | | Merge branch '41546-count-query-for-issues-and-mrs-runs-twice-on-group-index'... | Grzegorz Bizon | 2018-01-15 | 2 | -6/+11 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix double execution of COUNT query on group pages41546-count-query-for-issues-and-mrs-runs-twice-on-group-index | Sean McGivern | 2018-01-09 | 2 | -6/+11 |
* | | | | | | | | Merge branch 'fj-41598-fixing-request-mime-type' into 'master' | Douwe Maan | 2018-01-15 | 3 | -3/+16 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixing request json mime type | Francisco Javier López | 2018-01-15 | 3 | -3/+16 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'snippets-dispatcher-refactor' into 'master' | Phil Hughes | 2018-01-15 | 4 | -3/+31 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use common form.jssnippets-dispatcher-refactor | Clement Ho | 2018-01-12 | 5 | -21/+6 |
| * | | | | | | | | Fix eslint | Clement Ho | 2018-01-11 | 4 | -4/+4 |
| * | | | | | | | | Merge branch 'master' into snippets-dispatcher-refactor | Clement Ho | 2018-01-11 | 230 | -1467/+2886 |
| |\ \ \ \ \ \ \ \ |