summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Apply suggestion to doc/security/unlock_user.mddocs/security-follow-upEvan Read2019-07-161-1/+1
* Apply suggestion to doc/security/password_length_limits.mdEvan Read2019-07-161-1/+1
* Clean-up some confusing info from security docsAchilleas Pipinellis2019-06-1110-30/+57
* Merge branch 'ignore-artifact-attirbutes-in-project-import-export' into 'master'James Lopez2019-06-114-1/+15
|\
| * Ignore legacy artifact columns in Project Import/ExportShinya Maeda2019-06-114-1/+15
* | Merge branch 'fix-diff-system-note-alignment' into 'master'Filipa Lacerda2019-06-111-1/+1
|\ \
| * | Fix system note alignment within difffix-diff-system-note-alignmentAnnabel Dunstone Gray2019-06-101-1/+1
* | | Merge branch '58882-explicit-chrome-data-dir' into 'master'Thong Kuah2019-06-111-0/+3
|\ \ \
| * | | Explicitly set Chrome user-data-dir58882-explicit-chrome-data-dirHeinrich Lee Yu2019-06-111-0/+3
* | | | Merge branch 'prom-api-1' into 'master'Sean McGivern2019-06-1112-18/+94
|\ \ \ \
| * | | | Switch errors to inherit from a base classprom-api-1syasonik2019-06-065-25/+26
| * | | | Address rubocop errorssyasonik2019-06-062-3/+5
| * | | | Expose prometheus endpoint per metric in dashboardsyasonik2019-06-068-8/+81
| * | | | Named route for prometheus proxy_pathSimon Knox2019-06-061-1/+1
| * | | | Return no_content from prometheus API empty responseSimon Knox2019-06-062-3/+3
* | | | | Merge branch 'add-default-reactive-cache-key' into 'master'Nick Thomas2019-06-115-5/+15
|\ \ \ \ \
| * | | | | Add a default reactive cache keyadd-default-reactive-cache-keyTiger2019-06-075-5/+15
* | | | | | Merge branch 'add-eread-as-codeowner-doc' into 'master'Achilleas Pipinellis2019-06-111-1/+1
|\ \ \ \ \ \
| * | | | | | Add eread as CODEOWNER for doc dirEvan Read2019-06-111-1/+1
|/ / / / / /
* | | | | | Merge branch 'add-lfs-blob-ids-to-tree-type' into 'master'Filipa Lacerda2019-06-1111-2/+87
|\ \ \ \ \ \
| * | | | | | Add LFS blob ID to GraphQL blob typePhil Hughes2019-06-1011-2/+87
* | | | | | | Merge branch 'docs/ssot-university-topics' into 'master'Achilleas Pipinellis2019-06-1142-775/+266
|\ \ \ \ \ \ \
| * | | | | | | SSoT audit fixes for GitLab U topicsEvan Read2019-06-1142-775/+266
|/ / / / / / /
* | | | | | | Merge branch 'dz-cleanup-deprecated-code' into 'master'Kamil Trzciński2019-06-119-61/+5
|\ \ \ \ \ \ \
| * | | | | | | Remove some deprecated codedz-cleanup-deprecated-codeDmitriy Zaporozhets2019-06-079-61/+5
* | | | | | | | Merge branch 'process-when-auto-merge-is-enabled' into 'master'Kamil Trzciński2019-06-112-0/+13
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Notify when auto merge is enabledprocess-when-auto-merge-is-enabledShinya Maeda2019-06-102-0/+13
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'sh-fix-utf-8-encoding-resolve-conflicts' into 'master'Dmitriy Zaporozhets2019-06-113-4/+28
|\ \ \ \ \ \ \
| * | | | | | | Force source and target branch to binary modesh-fix-utf-8-encoding-resolve-conflictsStan Hu2019-06-102-10/+17
| * | | | | | | Fix UTF-8 conversion issues when resolving conflictsStan Hu2019-06-103-2/+19
* | | | | | | | Merge branch 'qa-ml-dry-retry-on-exception' into 'master'Sanad Liaquat2019-06-111-9/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | DRY exception handlingqa-ml-dry-retry-on-exceptionMark Lapierre2019-06-111-9/+2
* | | | | | | | | Merge branch 'patch-70' into 'master'Ray Paik2019-06-111-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove extra word on Health Check pageBen Bodenmiller2019-06-111-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'patch-55' into 'master'Evan Read2019-06-111-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve details about acceptable number of unicorn workerspatch-55Ben Bodenmiller2019-06-091-2/+2
* | | | | | | | | | Merge branch 'docs/ssot_scim_setup' into 'master'Evan Read2019-06-111-0/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Edit "SCIM Setup" for SSOTRussell Dickenson2019-06-111-0/+20
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'allow-emoji-in-references' into 'master'Robert Speicher2019-06-103-1/+29
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Allow emoji in label and milestone referencesallow-emoji-in-referencesSean McGivern2019-06-073-1/+29
* | | | | | | | | | Merge branch '61510-review-and-update-the-security-doc-pages-to-adhere-to-sso...Mike Lewis2019-06-1012-53/+250
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update links in information_exclusivity.md61510-review-and-update-the-security-doc-pages-to-adhere-to-ssot-standards-docsMike Lewis2019-06-091-2/+2
| * | | | | | | | | | Corrected links to use absolute path namesMatt Penna2019-06-071-2/+3
| * | | | | | | | | | Added links to pertinent GitLab docsMatt Penna2019-06-071-2/+3
| * | | | | | | | | | Apply suggestion to doc/security/webhooks.mdMatt Penna2019-06-071-2/+2
| * | | | | | | | | | Apply suggestion to doc/security/rack_attack.mdMatt Penna2019-06-071-1/+1
| * | | | | | | | | | Updated security docsMatt Penna2019-06-071-1/+1
| * | | | | | | | | | Various edits to security documentationMatt Penna2019-06-0711-51/+233
| * | | | | | | | | | Add type to frontmatterAchilleas Pipinellis2019-06-074-4/+17
* | | | | | | | | | | Merge branch 'osw-avoid-encoding-errors-on-merge-to-ref-service' into 'master'62183-update-response-code-for-bulk-delete-api-for-container-registry-2Robert Speicher2019-06-103-1/+24
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |