summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Include fixed-width mixin instead of extending the classremove-extend-fixed-widthAnnabel Dunstone Gray2019-04-111-8/+3
* Merge branch 'restore-hipchat' into 'master'Nick Thomas2019-04-1126-27/+963
|\
| * Restore index on services.typeSean McGivern2019-04-112-0/+21
| * Add frozen_string_literal to HipChat filesrestore-hipchatSean McGivern2019-04-103-0/+5
| * Fix UrlBlocker specSean McGivern2019-04-101-1/+1
| * Add changelog entrySean McGivern2019-04-101-0/+5
| * Revert "Remove HipChat integration from GitLab"Sean McGivern2019-04-1027-48/+953
* | Merge branch 'qa-staging-53-quarantine-issue-suggesstions-spec' into 'master'Rémy Coutable2019-04-111-1/+2
|\ \
| * | Qurantine Issue suggestions specSanad Liaquat2019-04-111-1/+2
* | | Merge branch 'docs/repo-mirrors-and-sidekiq' into 'master'Achilleas Pipinellis2019-04-111-6/+11
|\ \ \
| * | | Better documentation on repo mirroring enqueuingEvan Read2019-04-111-6/+11
|/ / /
* | | Merge branch 'docs-pages-intro' into 'master'Achilleas Pipinellis2019-04-118-367/+92
|\ \ \
| * | | Refactor intro guideMarcia Ramos2019-04-118-367/+92
|/ / /
* | | Merge branch 'docs/add-whitepaper-note' into 'master'Achilleas Pipinellis2019-04-111-0/+6
|\ \ \
| * | | Edits for GKE whitepaper noteEvan Read2019-04-111-0/+6
|/ / /
* | | Merge branch 'fixed-web-ide-merge-request-review' into 'master'Kushal Pandya2019-04-114-0/+47
|\ \ \
| * | | Fixes Web IDE not loading merge request filesPhil Hughes2019-04-114-0/+47
* | | | Merge branch 'revert-24704-download-repository-path' into 'master'Rémy Coutable2019-04-1118-136/+63
|\ \ \ \
| * | | | Revert "Merge branch '24704-download-repository-path' into 'master'"revert-24704-download-repository-pathPatrick Bajao2019-04-1118-136/+63
* | | | | Merge branch '60278-fix-development-seed' into 'master'Douwe Maan2019-04-113-4/+6
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix ApplicationSetting development seed60278-fix-development-seedRémy Coutable2019-04-103-4/+6
* | | | | Merge branch '59928-fix-the-following-style-lint-errors-and-warnings-for-app-...Filipa Lacerda2019-04-113-10/+8
|\ \ \ \ \
| * | | | | Create svg-w-100 utility class for svg containers59928-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-stat_graph-scssJose Vargas2019-04-103-10/+8
| | |_|/ / | |/| | |
* | | | | Merge branch 'limit-amount-of-created-pipelines' into 'master'Grzegorz Bizon2019-04-115-15/+70
|\ \ \ \ \
| * | | | | Process at most 4 pipelines during pushlimit-amount-of-created-pipelinesKamil Trzciński2019-04-105-15/+70
* | | | | | Merge branch 'ce-6120-extract-ee-specific-files-lines-for-spec-services-merge...Lin Jen-Shin2019-04-112-4/+2
|\ \ \ \ \ \
| * | | | | | Fix naming of testce-6120-extract-ee-specific-files-lines-for-spec-services-merge_requestsHeinrich Lee Yu2019-04-112-4/+2
* | | | | | | Merge branch 'jc-guard-against-empty-dereferenced_target' into 'master'Sean McGivern2019-04-113-1/+13
|\ \ \ \ \ \ \
| * | | | | | | Guard against nil dereferenced_targetjc-guard-against-empty-dereferenced_targetJohn Cai2019-04-103-1/+13
* | | | | | | | Merge branch 'winh-eslint-jest' into 'master'Phil Hughes2019-04-111-5/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Replace individual ESLint rules with jest/recommendedwinh-eslint-jestWinnie Hellmann2019-04-101-5/+2
* | | | | | | | | Merge branch 'winh-delete-static_fixtures.rb' into 'master'Phil Hughes2019-04-113-30/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Delete static_fixtures.rb for static HAML fixturesWinnie Hellmann2019-04-113-30/+15
|/ / / / / / / / /
* | | | | | | | | Merge branch 'gt-fix-styling-for-pages-import' into 'master'Phil Hughes2019-04-112-3/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace properties with utility classGeorge Tsiolis2019-04-102-3/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch '3353-trainee-backend-maintainer-ash-mckenzie-update-codeowners'...Sean McGivern2019-04-111-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add @ashmckenzie to backend CODEOWNERS3353-trainee-backend-maintainer-ash-mckenzie-update-codeownersAsh McKenzie2019-04-101-2/+2
* | | | | | | | | | Merge branch '10017-move-ee-differences-for-app-assets-javascripts-boards-mod...Kushal Pandya2019-04-111-3/+16
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Backported changes from EE for board list model10017-move-ee-differences-for-app-assets-javascripts-boards-models-list-jsConstance Okoghenun2019-04-101-3/+16
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '10016-move-ee-differences-for-app-assets-javascripts-boards-mod...Kushal Pandya2019-04-111-1/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Backported changes from EE for board issue model10016-move-ee-differences-for-app-assets-javascripts-boards-models-issue-jsConstance Okoghenun2019-04-101-1/+15
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fix/url_validator_' into 'master'James Lopez2019-04-1121-172/+292
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Align UrlValidator to validate_url gem implementation.Thong Kuah2019-04-1121-172/+292
|/ / / / / / / / /
* | | | | | | | | Merge branch 'patch-15' into 'master'Evan Read2019-04-111-4/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ci/yaml: add version info to changes only/exceptElan Ruusamäe2019-04-111-4/+9
|/ / / / / / / / /
* | | | | | | | | Merge branch 'vzagorodny-clarify-shell-cmds-link-title-ce' into 'master'Evan Read2019-04-111-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Clarify "Shell commands" link title in style guide docVictor Zagorodny2019-04-111-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch '60164-docs-feedback-write-your-title' into 'master'Evan Read2019-04-101-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update Time Tracking feature link60164-docs-feedback-write-your-titleMark Fletcher2019-04-101-1/+1
* | | | | | | | | | Merge branch 'sh-fix-docs-lint-ci' into 'master'Douglas Barbosa Alexandre2019-04-103-0/+0
|\ \ \ \ \ \ \ \ \ \