Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add link to JIRA article in docsdocs/jira-article | Achilleas Pipinellis | 2017-07-28 | 1 | -8/+13 |
| | |||||
* | Merge branch 'patch-18' into 'master' | Marcia Ramos | 2017-07-27 | 1 | -1/+1 |
|\ | | | | | | | | | remove extra space See merge request !13114 | ||||
| * | remove extra space | Ben Bodenmiller | 2017-07-26 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'rc/fix-branches-api-endpoint' into 'master' | Sean McGivern | 2017-07-27 | 1 | -1/+12 |
|\ \ | | | | | | | | | | | | | Fix the `/projects/:id/repository/branches endpoint` to handle dots in the branch name when the project full patch contains a `/` See merge request !13115 | ||||
| * | | Fix the /projects/:id/repository/branches endpoint to handle dots in the ↵ | Rémy Coutable | 2017-07-27 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | branch name when the project full patch contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | Merge branch 'feature/backup-custom-path' into 'master' | Rémy Coutable | 2017-07-27 | 1 | -0/+9 |
|\ \ \ | |/ / |/| | | | | | | | | Support custom directory in gitlab:backup:create task See merge request !12984 | ||||
| * | | Support custom directory in gitlab:backup:create task | Markus Koller | 2017-07-27 | 1 | -0/+9 |
| | | | |||||
* | | | Remove mentions of SeanPackham since he's no longer with GitLab | Rémy Coutable | 2017-07-27 | 2 | -3/+3 |
|/ / | |||||
* | | Merge branch 'HA-external-urls-docs' into 'master' | Sean McGivern | 2017-07-27 | 1 | -0/+6 |
|\ \ | | | | | | | | | | | | | Add note on external url setting for HA clusters. See merge request !13089 | ||||
| * | | Add note on external url setting for HA clusters.HA-external-urls-docs | Chenjerai Katanda | 2017-07-25 | 1 | -0/+6 |
| | | | |||||
* | | | Merge branch 'tc-issue-api-assignee' into 'master' | Sean McGivern | 2017-07-27 | 1 | -1/+15 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Add author_id & assignee_id param to /issues API Closes #29430 See merge request !13004 | ||||
| * | | Allow query param scope for /issues API endpointtc-issue-api-assignee | Toon Claes | 2017-07-24 | 1 | -6/+9 |
| | | | |||||
| * | | Add author_id & assignee_id param to /issues API | Toon Claes | 2017-07-24 | 1 | -1/+12 |
| | | | | | | | | | | | | Allow issues filtering on `author_id` and `assignee_id`. | ||||
* | | | Merge remote-tracking branch 'dev/master' | Douwe Maan | 2017-07-26 | 2 | -17/+51 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Gemfile # Gemfile.lock | ||||
| * | | | Update more examples | Michael Kozono | 2017-07-26 | 1 | -2/+3 |
| | | | | |||||
| * | | | Change encryption description | Michael Kozono | 2017-07-26 | 1 | -11/+16 |
| | | | | |||||
| * | | | Update LDAP SSL config options | Michael Kozono | 2017-07-26 | 1 | -4/+32 |
| | |/ | |/| | |||||
* | | | Merge branch '31129-jira-project-key-elim' into 'master' | Sean McGivern | 2017-07-26 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove project_key from the JIRA configuration Closes #31129 See merge request !12050 | ||||
| * | | | Remove project_key from the Jira configuration | Jarka Kadlecova | 2017-07-25 | 1 | -2/+2 |
| | |/ | |/| | |||||
* | | | Docs new topic "user/index" | Marcia Ramos | 2017-07-26 | 4 | -13/+210 |
| |/ |/| | |||||
* | | Merge branch '35204-doc-api-ci-lint-typo' into 'master' | Rémy Coutable | 2017-07-25 | 1 | -0/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | Add link to doc/api/ci/lint.md Closes #35204 See merge request !12914 | ||||
| * | | Add link to doc/api/ci/lint.md | Takuya Noguchi | 2017-07-17 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'patch-23' into 'master' | Drew Blessing | 2017-07-25 | 1 | -2/+5 |
|\ \ \ | | | | | | | | | | | | | | | | | Add instructions for enabling the `pg_trgm` during HA setup. See merge request !13057 | ||||
| * | | | Add instructions for enabling the `pg_trgm` extension in the production db. ↵ | Chenjerai Katanda | 2017-07-24 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | As a workaround to [a fault during HA setup](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/2501). | ||||
* | | | | Merge branch '30634-protected-pipeline' into 'master' | Kamil Trzciński | 2017-07-25 | 1 | -3/+4 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement "Block pipelines on protected branches" Closes #30634, #34616, and #33130 See merge request !11910 | ||||
| * | | | | Add a note that schedules could be deactivated | Lin Jen-Shin | 2017-07-21 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | when lacking permissions too. | ||||
* | | | | | Merge branch 'patch-24' into 'master' | Filipa Lacerda | 2017-07-25 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add directives to Vue component ordering See merge request !13065 | ||||
| * | | | | | Add directives to Vue component ordering | Simon Knox | 2017-07-25 | 1 | -0/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'issue_34622' into 'master' | Sean McGivern | 2017-07-25 | 2 | -1/+122 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group milestones API endpoint Closes #34622 See merge request !12819 | ||||
| * | | | | | Add group milestones API endpointissue_34622 | Felipe Artur | 2017-07-21 | 2 | -1/+122 |
| | | | | | | |||||
* | | | | | | Merge branch 'clarify-v3-end-date-undefined' into 'master' | Douwe Maan | 2017-07-25 | 1 | -3/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v3 API is unsupported after 9.5, but may not be removed See merge request !13074 | ||||
| * | | | | | | v3 API is unsupported after 9.5, but may not be removed | Sean McGivern | 2017-07-25 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That is, it may not _necessarily_ be removed. We do not provide guarantees for when API v3 will be available until beyond 9.5. | ||||
* | | | | | | | Resolve "More RESTful API: include resource URLs in responses" | Oswaldo Ferreira | 2017-07-25 | 2 | -10/+121 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'archytaus/gitlab-ce-26372-duplicate-issue-slash-command' into ↵ | Rémy Coutable | 2017-07-25 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' New `/duplicate` quick action Closes #26372 See merge request !12845 | ||||
| * | | | | | | | Added slash command to close an issue as a duplicate. Closes #26372 | Ryan Scott | 2017-07-20 | 1 | -0/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Update docs on using external registry with gitlab | Balasankar C | 2017-07-25 | 1 | -5/+24 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Resolve "Lazy load images on the Frontend" | Tim Zallmann | 2017-07-24 | 1 | -0/+12 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge branch 'enhance-backend-review-guide' into 'master' | Rémy Coutable | 2017-07-24 | 1 | -0/+49 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GitLab-specific concerns to code review guide Closes #35099 See merge request !12999 | ||||
| * | | | | | Add GitLab-specific concerns to code review guide | Sean McGivern | 2017-07-24 | 1 | -0/+49 |
| |/ / / / | |||||
* | | | | | Merge branch '33097-issue-tracker' into 'master' | Sean McGivern | 2017-07-24 | 3 | -5/+7 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Associate Issues tab only with internal issues tracker Closes #33097 See merge request !12130 | ||||
| * | | | | Change docs to support paralel external and internal issue trackers | Jarka Kadlecova | 2017-07-24 | 3 | -5/+7 |
| | | | | | |||||
* | | | | | Merge branch '35330-fix-nginx-add-haproxy' into 'master' | Tim Zallmann | 2017-07-24 | 3 | -1/+22 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | Fix NGINX Error Rate query, include HA Proxy See merge request !13005 | ||||
| * | | | | Update nginx docs35330-fix-nginx-add-haproxy | Joshua Lambert | 2017-07-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add HA Proxy metrics, fix NGINX | Joshua Lambert | 2017-07-20 | 2 | -0/+21 |
| | | | | | |||||
* | | | | | Merge branch 'dz-sidekiq-remove-queue' into 'master' | Sean McGivern | 2017-07-21 | 1 | -0/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update sidekiq style guide with rename/remove queue instructions Closes #34223 See merge request !13009 | ||||
| * | | | | | Capitalize Sidekiq word in dev doc | Dmitriy Zaporozhets | 2017-07-21 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Update sidekiq_style_guide.md with removing or renaming queues instructionsdz-sidekiq-remove-queue | Dmitriy Zaporozhets | 2017-07-21 | 1 | -0/+7 |
| | | | | | | |||||
* | | | | | | Merge branch 'harishsr-fix-typo-in-ldap-docs' into 'master' | Drew Blessing | 2017-07-21 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in the LDAP docs missing a required colon See merge request !12973 | ||||
| * | | | | | | Fix typo in the LDAP docs missing a required colon | Harish Ramachandran | 2017-07-19 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'docs/gb/update-background-migrations-development-docs' into ↵ | Sean McGivern | 2017-07-21 | 1 | -0/+36 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Extend background migration development guidelines See merge request !12988 |