summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove spec that spies on Autosize()mr-show-dispatcher-refactorClement Ho2018-02-072-24/+8
* Remove Autosize from the window objectConstance Okoghenun2018-02-071-9/+11
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into mr-show...Constance Okoghenun2018-02-06643-3854/+11140
|\
| * Merge branch 'feature/sm/artifacts-trace' into 'master'Kamil Trzciński2018-02-0628-61/+1556
| |\
| | * Reorder async/sync tasks in BuildFinishedWorker to read traces efficientlyfeature/sm/artifacts-traceShinya Maeda2018-02-062-12/+11
| | * Fix tests for Drop filename enforcementShinya Maeda2018-02-062-17/+1
| | * Revert using expand_fixture_path in factoryShinya Maeda2018-02-061-1/+1
| | * Revert "Add FixtureHelpers for FactoryGirl"Shinya Maeda2018-02-061-3/+0
| | * Refactor :trace to :trace_live in specShinya Maeda2018-02-068-25/+25
| | * Make all workers in BuildFinishedWorker to run async and reorderShinya Maeda2018-02-061-2/+2
| | * Drop filename enforcementShinya Maeda2018-02-061-6/+0
| | * Add FixtureHelpers for FactoryGirlShinya Maeda2018-02-061-0/+3
| | * GB catches: CreateTraceArtifactService project, user passShinya Maeda2018-02-061-2/+2
| | * Alessio catches: Test fixShinya Maeda2018-02-062-2/+2
| | * Backport sample_trace in fixturesShinya Maeda2018-02-061-16/+1183
| | * Remove unnecessary changes for job features specShinya Maeda2018-02-061-5/+5
| | * Finish all testsShinya Maeda2018-02-065-28/+82
| | * update docShinya Maeda2018-02-061-2/+2
| | * Fix create_trace_artifact_worker_spec.rbShinya Maeda2018-02-061-1/+1
| | * Add changelogShinya Maeda2018-02-061-0/+5
| | * Fix retry_build_service_spec.rb with trace_artifact traitShinya Maeda2018-02-062-1/+7
| | * Add essential testsShinya Maeda2018-02-069-1/+241
| | * Fix inital test failuresShinya Maeda2018-02-062-5/+8
| | * Add worker queueShinya Maeda2018-02-063-2/+3
| | * Rename CreateArtifactsTraceService to CreateTraceArtifactServiceShinya Maeda2018-02-066-33/+25
| | * Revert live-trace pathShinya Maeda2018-02-061-24/+12
| | * Add CreateArtifactsTraceWorkerShinya Maeda2018-02-066-21/+35
| | * Expose current_pathShinya Maeda2018-02-062-9/+11
| | * Check existance of the file when trace_artifact is readShinya Maeda2018-02-061-2/+2
| | * Move default_path to legacy_default_path. Switch to the new path for live-traceShinya Maeda2018-02-061-10/+28
| | * JobArtifactUploader#open raise execption if its not FilestorageShinya Maeda2018-02-061-1/+3
| | * Inlcude the size of trace artifactsShinya Maeda2018-02-061-2/+1
| | * Remove unnecessary changesShinya Maeda2018-02-061-6/+10
| | * Trace as artifactsShinya Maeda2018-02-065-10/+33
| * | Merge branch 'fix/show-sidebar-sub-level-items-for-billing' into 'master'Sean McGivern2018-02-063-1/+10
| |\ \
| | * | Override group sidebar linksGeorge Tsiolis2018-02-063-1/+10
| * | | Merge branch '42798-fix-hardcoded-id-in-spinach' into 'master'Rémy Coutable2018-02-061-3/+3
| |\ \ \
| | * | | Fix a hardcoded pipeline ID in a spinach stepNick Thomas2018-02-061-3/+3
| * | | | Merge branch '39550-group-labels-redesign' into 'master'Tim Zallmann2018-02-069-37/+95
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Use sprite_icon and variables39550-group-labels-redesignAnnabel Dunstone Gray2018-02-053-3/+4
| | * | | Fix padding & font size on labelsAnnabel Dunstone Gray2018-01-302-3/+4
| | * | | Fix labels specsAnnabel Dunstone Gray2018-01-304-6/+7
| | * | | Add modal for label deletionAnnabel Dunstone Gray2018-01-293-3/+30
| | * | | Change delete notice; update mobile stylesAnnabel Dunstone Gray2018-01-293-17/+31
| | * | | Start redesign of group labels pageAnnabel Dunstone Gray2018-01-293-27/+41
| * | | | Merge branch '26468-fix-admin-recent-sign-in' into 'master'Rémy Coutable2018-02-063-10/+20
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Using correct column for sorting users by Recent Sign-inPoornima2018-02-053-10/+20
| * | | | Merge branch 'qa/mk-fix-slow-wait' into 'master'Stan Hu2018-02-061-2/+1
| |\ \ \ \
| | * | | | Fix wait conditionqa/mk-fix-slow-waitMichael Kozono2018-02-051-2/+1
| * | | | | Merge branch '31885-ability-to-transfer-groups-to-another-group' into 'master'Douwe Maan2018-02-0618-50/+781
| |\ \ \ \ \