summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix broken link to EE pagedocs-update_security_products_examplesOlivier Gonzalez2018-04-031-1/+1
* Update Security Products examples documentationOlivier Gonzalez2018-04-033-7/+31
* Merge branch '44921-wrong-user-in-push-notification-email' into 'master'Grzegorz Bizon2018-04-034-3/+34
|\
| * Fix body of email when commits are pushed to an MRSean McGivern2018-04-034-3/+34
* | Merge branch 'qa/gb/do-not-auto-retry-package-and-qa-action' into 'master'Rémy Coutable2018-04-031-0/+1
|\ \ | |/ |/|
| * Do not retry package-and-qa manual action on failureqa/gb/do-not-auto-retry-package-and-qa-actionGrzegorz Bizon2018-04-021-0/+1
* | Merge branch 'blackst0ne-replace-spinach-project-issues-issues.feature' into ...Rémy Coutable2018-04-0329-580/+532
|\ \
| * | Replace the `project/issues/issues.feature` spinach test with an rspec analogblackst0ne2018-04-0329-580/+532
|/ /
* | Merge branch 'sh-move-sidekiq-exporter-logs' into 'master'Sean McGivern2018-04-034-2/+25
|\ \
| * | Move Sidekiq exporter logs to log/sidekiq_exporter.logsh-move-sidekiq-exporter-logsStan Hu2018-04-024-2/+25
| |/
* | Merge branch 'blackst0ne-rails5-isolate-test_after_commit' into 'master'Rémy Coutable2018-04-032-23/+27
|\ \
| * | [Rails5] Isolate `test_after_commit` gemblackst0ne-rails5-isolate-test_after_commitblackst0ne2018-04-032-23/+27
| |/
* | Merge branch 'backport-os-worker-specs' into 'master'Sean McGivern2018-04-032-0/+265
|\ \
| * | backport missing object storage worker specsbackport-os-worker-specsMicaël Bergeron2018-04-022-0/+265
* | | Merge branch 'docs/performance-testing' into 'master'Marcia Ramos2018-04-021-20/+73
|\ \ \
| * | | Refactor the browser performance testing docsdocs/performance-testingAchilleas Pipinellis2018-03-291-20/+73
* | | | Merge branch 'dm-gitlab-http-blocked-url-error' into 'master'Robert Speicher2018-04-0210-50/+90
|\ \ \ \ | |_|/ / |/| | |
| * | | Rename allow_private_networks to allow_local_networkDouwe Maan2018-04-024-14/+12
| * | | Make error messages even more descriptiveDouwe Maan2018-04-023-37/+51
| * | | Added rescue to show a custom error when testing project integrationsFrancisco Javier López2018-04-021-0/+2
| * | | Raise more descriptive errors when URLs are blockedDouwe Maan2018-04-026-26/+52
* | | | Merge branch '40907-confidential-lock-icons-collapsed-sidebar' into 'master'Filipa Lacerda2018-04-0210-163/+297
|\ \ \ \
| * | | | Resolve "Clicking confidential and lock icons on sidebar should also activate...Dennis Tang2018-04-0210-163/+297
|/ / / /
* | | | Merge branch 'dz-type-button' into 'master'Filipa Lacerda2018-04-027-14/+14
|\ \ \ \
| * | | | Add button type to settings toggledz-type-buttonDmitriy Zaporozhets2018-04-027-14/+14
* | | | | Merge branch '44878-update-brakeman-3.6.1-to-4.2.1' into 'master'Robert Speicher2018-04-023-3/+8
|\ \ \ \ \
| * | | | | Update brakeman 3.6.1 to 4.2.1Takuya Noguchi2018-04-013-3/+8
* | | | | | Merge branch 'docs/mirrored-repositories-for-pipelines-ce' into 'master'Marcia Ramos2018-04-023-2/+16
|\ \ \ \ \ \
| * | | | | | Provide clarification on mirrored repositories for pipelinesdocs/mirrored-repositories-for-pipelines-ceAchilleas Pipinellis2018-03-303-2/+16
* | | | | | | Merge branch 'docs/lfs-s3-ce' into 'master'Marcia Ramos2018-04-021-53/+56
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Refactor the LFS S3 docsdocs/lfs-s3-ceAchilleas Pipinellis2018-03-301-53/+57
* | | | | | | Merge branch 'fl-prettier-mock-data' into 'master'Clement Ho2018-04-027-882/+961
|\ \ \ \ \ \ \
| * | | | | | | Removes eslint disabled commentsfl-prettier-mock-dataFilipa Lacerda2018-03-297-882/+961
* | | | | | | | Merge branch 'backport-to-CE-5023' into 'master'Douwe Maan2018-04-0210-32/+831
|\ \ \ \ \ \ \ \
| * | | | | | | | Backport changes in EE MR 4972: System Header and FooterAndré Luís2018-04-0210-32/+831
|/ / / / / / / /
* | | | | | | | Merge branch 'jramsay-list-commit-statuses-docs' into 'master'Douwe Maan2018-04-021-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Add pagination docs to commit status APIjramsay-list-commit-statuses-docsJames Ramsay2018-04-011-2/+3
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'sh-cleanup-crlf-gitmodules' into 'master'Douwe Maan2018-04-022-2/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Handle CR-LFs properly in .gitmodules filesh-cleanup-crlf-gitmodulesStan Hu2018-03-302-2/+5
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'ce-jej/settings-for-saml-sso-per-group' into 'master'Sean McGivern2018-04-024-0/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | Adds validators and rack cookie helperJames Edwards-Jones2018-04-024-0/+33
* | | | | | | | | Merge branch '44776-fix-upload-migrate-fails-for-group' into 'master'Sean McGivern2018-04-024-16/+135
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | apply feedbackMicaël Bergeron2018-04-021-1/+15
| * | | | | | | | add changelogMicaël Bergeron2018-04-021-0/+5
| * | | | | | | | fix the rake task from being to strict about GroupMicaël Bergeron2018-04-023-16/+116
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'blackst0ne-bump-html-pipeline-gem' into 'master'Sean McGivern2018-04-026-8/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Bump html-pipeline to 2.7.1blackst0ne-bump-html-pipeline-gemblackst0ne2018-04-026-8/+12
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'docs-update-issue-mr-description-templates-api' into 'master'Sean McGivern2018-04-021-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Update docs for API for issue and merge request description templatesVictor Wu2018-04-021-0/+4
|/ / / / / / /
* | | | | | | Merge branch 'dz-improve-app-settings-3' into 'master'Filipa Lacerda2018-04-026-137/+201
|\ \ \ \ \ \ \
View Lorry Controller Status