summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Include the `is_admin` field in the `GET /users/:id` API when current user is...36213-return-is_admin-in-users-api-when-current_user-is-adminRémy Coutable2017-08-113-9/+20
* Merge branch 'fix-36308' into 'master'Rémy Coutable2017-08-111-5/+4
|\
| * Remove an unnecessary `let` in spec/features/projects/user_edits_files_spec.rbMehdi Lahmam2017-08-111-5/+4
* | Merge branch 'bump-omniauth-ldap-gem-version-2-0-4' into 'master'Douwe Maan2017-08-113-3/+7
|\ \
| * | Bumps omniauth-ldap gem version to 2.0.4bump-omniauth-ldap-gem-version-2-0-4Tiago Botelho2017-08-113-3/+7
* | | Merge branch 'zj-ref-path-monospace' into 'master'Douwe Maan2017-08-112-1/+5
|\ \ \ | |/ / |/| |
| * | Fix 404 on link pathzj-ref-path-monospaceZ.J. van de Weg2017-08-102-1/+5
* | | Merge branch 'master' into 'master'Rémy Coutable2017-08-111-1/+1
|\ \ \
| * | | Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb.Olivier DOSSMANN2017-08-111-1/+1
* | | | Merge branch 'gitlab-git-expose-raw-log' into 'master'Sean McGivern2017-08-111-16/+17
|\ \ \ \ | |/ / / |/| | |
| * | | Expose the raw_log methodgitlab-git-expose-raw-logJacob Vosmaer2017-08-091-16/+17
* | | | Merge branch '36270-collapsed-sidebar-scroll' into 'master'Phil Hughes2017-08-111-0/+1
|\ \ \ \
| * | | | Hide overflow-x on collapsed sidebar36270-collapsed-sidebar-scrollAnnabel Dunstone Gray2017-08-101-0/+1
* | | | | Merge branch 'fix-typos' into 'master'36327-tooltipRémy Coutable2017-08-113-4/+4
|\ \ \ \ \
| * | | | | Fix minor typos in viewsMehdi Lahmam2017-08-113-4/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'docs-update-docs' into 'master'Achilleas Pipinellis2017-08-112-59/+33
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Docs: update user docs indexMarcia Ramos2017-08-112-59/+33
|/ / / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJose Ivan Vargas2017-08-10170-696/+1246
|\ \ \ \
| * \ \ \ Merge branch '36192-change-ha-docs-to-update-using-efs-as-nfs' into 'master'Stan Hu2017-08-101-0/+4
| |\ \ \ \
| | * | | | Update nfs.md with information on AWS EFS and Burst Credit usage and how to i...36192-change-ha-docs-to-update-using-efs-as-nfsJohn Woods2017-08-081-0/+4
| * | | | | Fix Layout/SpaceBeforeBlockBraces violation in bin/changelog_specRobert Speicher2017-08-101-1/+1
| * | | | | Merge branch 'jej/security-release-2017-08-10' into 'master'Stan Hu2017-08-106-1/+61
| |\ \ \ \ \
| | * | | | | Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4'jej/security-release-2017-08-10James Edwards-Jones2017-08-103-0/+47
| | * | | | | Merge branch 'import-symlinks-9-3' into 'security-9-3'James Edwards-Jones2017-08-103-1/+14
| * | | | | | Merge branch 'filter-nginx-access-logs' into 'master'Robert Speicher2017-08-102-3/+71
| |\ \ \ \ \ \
| | * | | | | | Filter sensitive query string parameters from NGINX access logsNick Thomas2017-08-102-3/+71
| | |/ / / / /
| * | | | | | Merge branch '21949-add-type-to-changelog' into 'master'Robert Speicher2017-08-104-75/+215
| |\ \ \ \ \ \
| | * | | | | | Let's start labeling our CHANGELOG entriesJacopo2017-07-224-75/+215
| * | | | | | | Merge branch 'rc/improve-projects-factory' into 'master'Robert Speicher2017-08-106-196/+130
| |\ \ \ \ \ \ \
| | * | | | | | | Fix and improve spec/controllers/autocomplete_controller_spec.rbrc/improve-projects-factoryRémy Coutable2017-08-101-77/+56
| | * | | | | | | Improve the Project factory to make `creator` defaults to namespace.ownerRémy Coutable2017-08-105-119/+74
| * | | | | | | | Merge branch 'breakpoint-checker-performance' into 'master'Filipa Lacerda2017-08-1012-92/+48
| |\ \ \ \ \ \ \ \
| | * | | | | | | | removed global use of breakpoint checkerbreakpoint-checker-performancePhil Hughes2017-08-1011-34/+18
| | * | | | | | | | Increase performance of the breakpoint size checkerPhil Hughes2017-08-102-61/+33
| * | | | | | | | | Merge branch 'zj-fix-prom-metrics' into 'master'Stan Hu2017-08-102-5/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix wrong method call on prometheus histogramzj-fix-prom-metricsZ.J. van de Weg2017-08-102-5/+5
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'rs-fix-stubbed-user-factory' into 'master'Rémy Coutable2017-08-101-0/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Manually assign `notification_email` in the User factory when stubbedrs-fix-stubbed-user-factoryRobert Speicher2017-08-081-0/+4
| * | | | | | | | | | Merge branch '36039-document-new-all-in-one-helm-chart-docs' into 'master'Achilleas Pipinellis2017-08-104-12/+182
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Document new all-in-one Helm chart - docsJoshua Lambert2017-08-104-12/+182
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'docs/add-toc' into 'master'Achilleas Pipinellis2017-08-101-0/+4
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Start using 'toc' in yaml frontmatter to explicitly disable itdocs/add-tocAchilleas Pipinellis2017-08-041-0/+4
| * | | | | | | | | | Merge branch '29811-fix-line-number-alignment' into 'master'Annabel Dunstone Gray2017-08-102-1/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix line numbers not matching up to code in code viewer.Trevor Flynn2017-08-102-1/+5
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'remove-affix-issuable-sidebar-new-nav' into 'master'Filipa Lacerda2017-08-102-1/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Remove affix plugin from issuable sidebar with new navigationremove-affix-issuable-sidebar-new-navPhil Hughes2017-08-102-1/+4
| * | | | | | | | | | | Merge branch '36158-new-issue-button' into 'master'Phil Hughes2017-08-103-3/+7
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Render new issue link in failed job as a regular link instead of a UJS one36158-new-issue-buttonFilipa Lacerda2017-08-103-3/+7
| * | | | | | | | | | | | Merge branch 'db-changes-mr-template' into 'master'Rémy Coutable2017-08-101-0/+73
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Added a template for database changesYorick Peterse2017-08-101-0/+73
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | |