summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Config Value storekamil-refactor-ci-builds-v4Kamil Trzciński2018-09-034-0/+197
* Add dependent model `build_config` that stores all dynamic job configurationKamil Trzciński2018-09-0226-67/+155
* Merge branch 'assert-that-mr-diff-is-highlighted' into 'master'Grzegorz Bizon2018-09-011-1/+2
|\
| * Add spec to ensure MR diffs are highlightedSean McGivern2018-08-291-1/+2
* | Merge branch 'feature/#32877-add-default-field-branch-api' into 'master'Robert Speicher2018-09-014-0/+16
|\ \
| * | Fix testsRiccardo Padovani2018-08-181-0/+2
| * | Add default parameter to branches APIRiccardo Padovani2018-08-183-0/+14
* | | Merge branch '50365_fix_fast_spec_helper' into 'master'Robert Speicher2018-09-012-2/+1
|\ \ \
| * | | Move fixture_path out of support/rspec file which is used by fast_spec_helper...Thong Kuah2018-08-312-2/+1
* | | | Merge branch 'ash.mckenzie/allow-auth-via-jwt' into 'master'Robert Speicher2018-08-311-0/+6
|\ \ \ \
| * | | | Allow auth via JWT (always false in CE)ash.mckenzie/allow-auth-via-jwtAsh McKenzie2018-08-141-0/+6
* | | | | Merge branch 'sh-fix-confidential-note-option' into 'master'Robert Speicher2018-08-313-0/+7
|\ \ \ \ \
| * | | | | Fix "Confidential comments" button not saving in project hookssh-fix-confidential-note-optionStan Hu2018-08-173-0/+7
* | | | | | Merge branch '47765-group-visibility-error-due-to-string-conversion' into 'ma...Douwe Maan2018-08-313-1/+20
|\ \ \ \ \ \
| * | | | | | Changes update_column to update_attributes in ProjectTreeRestorer#restore_pro...Tiago Botelho2018-08-283-1/+20
* | | | | | | Merge branch 'remove-background-migration-worker-feature-flag' into 'master'Douwe Maan2018-08-312-13/+6
|\ \ \ \ \ \ \
| * | | | | | | Remove feature flag from BackgroundMigrationWorkerYorick Peterse2018-08-282-13/+6
* | | | | | | | Merge branch '37356-relative-submodule-link' into 'master'Douwe Maan2018-08-313-37/+80
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow resolving git submodule url for subgroup projects using relative path37356-relative-submodule-linkMark Chao2018-08-203-37/+80
* | | | | | | | | Merge branch 'ide-row-hover-scroll' into 'master'Filipa Lacerda2018-08-313-5/+33
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed IDE file row jumping into view on hoverPhil Hughes2018-08-313-5/+33
* | | | | | | | | | Merge branch '46591-fix-ide-height-issues' into 'master'Phil Hughes2018-08-318-67/+58
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Resolve "Persistent banner creates problem for web ide"Paul Slaughter2018-08-318-67/+58
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'update-padding-markdown' into 'master'Phil Hughes2018-08-314-5/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Increase padding in markdown code blocksAnnabel Dunstone Gray2018-08-304-5/+7
* | | | | | | | | | | Merge branch '46673-qa-sanity-tests-fail-with-uninitialized-constant-qa-page-...Grzegorz Bizon2018-08-311-1/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [QA] Require Pathname in qa/qa/page/view.rbRémy Coutable2018-08-301-1/+3
* | | | | | | | | | | | Merge branch 'fix-ide-project-avatar-styles' into 'master'Phil Hughes2018-08-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix IDE avatar flex sizing stylePaul Slaughter2018-08-301-1/+1
* | | | | | | | | | | | Merge branch 'reorganize-issues-and-mrs-feature-specs' into 'master'Sean McGivern2018-08-3128-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Reorganize issues and merge request feature specs in the same folderRémy Coutable2018-08-3028-0/+0
* | | | | | | | | | | | | Merge branch 'compliance-docs' into 'master'Achilleas Pipinellis2018-08-312-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add initial Compliance doc based on features.yml Compliance featuresMike Lewis2018-08-312-0/+19
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'winh-fix-pdf-page-spec-timing' into 'master'Filipa Lacerda2018-08-311-35/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove waiting from PDF page component testWinnie Hellmann2018-08-231-35/+27
* | | | | | | | | | | | | Merge branch 'ide-multiple-file-uploads' into 'master'Filipa Lacerda2018-08-303-6/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Enabled multiple uploads in the Web IDEPhil Hughes2018-08-293-6/+24
* | | | | | | | | | | | | | Merge branch '47943-project-milestone-page-deprecation-message' into 'master'Filipa Lacerda2018-08-304-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add changelog entryKushal Pandya2018-08-281-0/+5
| * | | | | | | | | | | | | | Add milestone tabs deprecation viewKushal Pandya2018-08-281-0/+1
| * | | | | | | | | | | | | | Project Milestone Tabs Deprecation PartialKushal Pandya2018-08-282-0/+19
* | | | | | | | | | | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-08-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | corrects microsoft_teams.md webhook urlChovin Carlson2018-08-281-1/+1
* | | | | | | | | | | | | | | Merge branch 'winh-upgrade-license-finder' into 'master'Rémy Coutable2018-08-303-23/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Upgrade LicenseFinder Gem to v5.4.0Winnie Hellmann2018-08-303-23/+17
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'schema-changed-ee-backport' into 'master'Rémy Coutable2018-08-302-4/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Backport schema_changed.sh from EE which prints the diff if the schema is dif...Jasper Maes2018-08-302-4/+14
* | | | | | | | | | | | | | | | Merge branch 'sh-backport-groups-png-docs' into 'master'11-3-stable-prepare-rc1Rémy Coutable2018-08-301-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Backport doc/user/group/img/groups.png changes from EEStan Hu2018-08-291-0/+0
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'update-11-2-3-and-11-1-6' into 'master'Stan Hu2018-08-301-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \