summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch '58010-mask-the-existing-variables' into 'master'"revert-a97261f2Luke Bennett2019-03-0710-25/+20
* Merge branch 'ce-10266-job-failed-173481892' into 'master'Luke Bennett2019-03-071-4/+6
|\
| * Fix for mismatch in EE on FIXTURE_PATHS to FIXTURE_PATHRémy Coutable2019-03-071-4/+6
* | Merge branch '8845-epic-sidebar-list' into 'master'Annabel Dunstone Gray2019-03-071-0/+52
|\ \
| * | Display Ancestors in Issuable SidebarRajat Jain2019-03-071-0/+52
|/ /
* | Merge branch '46464-improve-stop-pipeline-modal' into 'master'Kushal Pandya2019-03-075-36/+112
|\ \
| * | Emit submit event instead of passing handlermfluharty2019-03-072-6/+7
| * | Add fields displayed in modal to testmfluharty2019-03-071-1/+3
| * | Update corresponding testmfluharty2019-03-071-1/+1
| * | Add information to "Stop pipeline" confirm modalmfluharty2019-03-074-35/+108
* | | Merge branch '58648-project-template-for-ios' into 'master'Fatih Acet2019-03-076-0/+14
|\ \ \
| * | | Resolve "Project template for iOS"Jason Lenny2019-03-076-0/+14
|/ / /
* | | Merge branch '56618-hashed-storage-skip-validation' into 'master'Stan Hu2019-03-079-4/+33
|\ \ \
| * | | Skip project validation when switching storage layoutsGabriel Mazetto2019-03-059-4/+33
* | | | Merge branch 'use-date-for-upcoming-milestone-comparison' into 'master'Andreas Brandl2019-03-073-2/+22
|\ \ \ \
| * | | | Fix upcoming milestone for far-future due datesSean McGivern2019-03-062-2/+7
| * | | | Add failing test for milestone with far-future dateSean McGivern2019-03-061-0/+15
* | | | | Merge branch 'incremental-backups' into 'master'Stan Hu2019-03-075-4/+37
|\ \ \ \ \
| * | | | | add comment on how to determine if rsyncable option is availableFrederic Van Espen2019-03-071-1/+3
| * | | | | trim empty lineFrederic Van Espen2019-03-071-1/+0
| * | | | | Merge branch 'master' into incremental-backupsFrederic Van Espen2019-03-075888-66422/+248664
| |\ \ \ \ \
| * | | | | | fix option testFrederic Van Espen2019-03-071-1/+1
| * | | | | | introduce optional rsyncable flagFrederic Van Espen2019-03-074-3/+20
| * | | | | | fix code styleFrederic Van Espen2018-12-271-5/+5
| * | | | | | set the --rsyncable option for gzipFrederic Van Espen2018-12-262-3/+3
| * | | | | | Allow to override part of the backup filenameFrederic Van Espen2018-12-262-1/+16
* | | | | | | Merge branch 'release_usage_metrics' into 'master'Rémy Coutable2019-03-072-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Adding additional usage metrics for Release to weekly pingDarby Frey2019-03-072-0/+4
|/ / / / / / /
* | | | | | | Merge branch '58010-mask-the-existing-variables' into 'master'Kamil Trzciński2019-03-0710-20/+25
|\ \ \ \ \ \ \
| * | | | | | | Resolve "Mask the existing variables"Matija Čupić2019-03-0710-20/+25
|/ / / / / / /
* | | | | | | Merge branch 'remove-translation-dep-in-ca-spec' into 'master'Rémy Coutable2019-03-071-19/+0
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Remove translation dependency in CA specLuke Bennett2019-03-071-19/+0
|/ / / / / /
* | | | | | Merge branch 'sh-rugged-get-tree-entry' into 'master'Sean McGivern2019-03-074-1/+132
|\ \ \ \ \ \
| * | | | | | Fix return nil Rubocop offensesStan Hu2019-03-071-3/+3
| * | | | | | Bring back Rugged implementation of TreeEntryStan Hu2019-03-074-1/+132
* | | | | | | Merge branch 'jest-docs' into 'master'Mike Lewis2019-03-071-8/+52
|\ \ \ \ \ \ \
| * | | | | | | Apply suggestion to doc/development/testing_guide/frontend_testing.mdLuke Bennett2019-03-071-1/+1
| * | | | | | | Add jest to frontend_testing docsLuke Bennett2019-03-041-8/+52
* | | | | | | | Merge branch 'dz-patch-48' into 'master'Lin Jen-Shin2019-03-071-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Update packages comment in gitlab.yml.example [ci skip]Dmitriy Zaporozhets2019-03-071-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'ce-extract-ee-specific-code-for-spec/support' into 'master'Dmitriy Zaporozhets2019-03-079-87/+138
|\ \ \ \ \ \ \ \
| * | | | | | | | Reduce differences in spec/support/shared_contexts/services_shared_context.rbRémy Coutable2019-03-071-0/+8
| * | | | | | | | Reduce differences in spec/support/webmock.rbRémy Coutable2019-03-071-1/+9
| * | | | | | | | Reduce differences in spec/support/matchers/access_matchers.rbRémy Coutable2019-03-071-18/+17
| * | | | | | | | Reduce differences in spec/support/helpers/kubernetes_helpers.rbRémy Coutable2019-03-071-0/+15
| * | | | | | | | Reduce differences in spec/support/helpers/javascript_fixtures_helpers.rbRémy Coutable2019-03-072-22/+27
| * | | | | | | | Reduce differences in spec/support/db_cleaner.rbRémy Coutable2019-03-072-45/+61
| * | | | | | | | Reduce differences in spec/support/api/schema_matcher.rbRémy Coutable2019-03-071-1/+1
* | | | | | | | | Merge branch 'sh-rugged-tree-entries' into 'master'Sean McGivern2019-03-076-15/+191
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unnecessary return statements in tree.rbStan Hu2019-03-071-2/+2
| | |_|/ / / / / / | |/| | | | | | |