summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add changelogstorage-cleanup-workerKamil Trzciński2018-06-061-0/+5
* Add cleanup worker to cron jobsKamil Trzciński2018-06-061-0/+4
* Implement storage cleanup workerKamil Trzciński2018-06-062-0/+146
* Merge branch 'ide-jobs-log' into 'master'Filipa Lacerda2018-06-0622-26/+823
|\
| * added empty statePhil Hughes2018-06-065-2/+27
| * fixed row log link titlePhil Hughes2018-06-061-1/+1
| * added missing button typePhil Hughes2018-06-063-4/+13
| * design updatePhil Hughes2018-06-063-9/+35
| * component specsPhil Hughes2018-06-064-8/+262
| * store specsPhil Hughes2018-06-064-1/+189
| * fixed sidebar button not having active classPhil Hughes2018-06-061-1/+7
| * reduced duplication of job detailsPhil Hughes2018-06-065-80/+134
| * moved fetching trace to storePhil Hughes2018-06-069-98/+87
| * removed need for job.jsPhil Hughes2018-06-063-92/+193
| * Show job logs in web IDEPhil Hughes2018-06-0611-30/+175
* | Merge branch 'jprovazn-uploader-migration' into 'master'Sean McGivern2018-06-064-1/+55
|\ \
| * | Migrate jobs in object_storage_upload queueJan Provaznik2018-06-054-1/+55
* | | Merge branch 'sh-add-rake-task-docs-and-bump-grape-path-helpers' into 'master'Sean McGivern2018-06-062-1/+18
|\ \ \
| * | | Bump grape-path-helpers to 1.0.2 to get updated Rake task namingStan Hu2018-06-062-1/+18
| | |/ | |/|
* | | Merge branch '47196-actionview-missingtemplate-missing-template-projects-merg...Grzegorz Bizon2018-06-063-22/+37
|\ \ \
| * | | Render 'invalid' if #target_branch_missing?Ash McKenzie2018-06-061-18/+7
| * | | Rename #check_if_can_be_merged -> #mark_merge_request_mergeableAsh McKenzie2018-06-061-2/+2
| * | | Rename #close_merge_request_without_source_projectAsh McKenzie2018-06-061-2/+2
| * | | Add missing tests around rendering invalid merge requests (HTML+JSON)Ash McKenzie2018-06-062-0/+26
* | | | Merge branch '46858-triggered-at' into 'master'Kamil Trzciński2018-06-062-3/+9
|\ \ \ \
| * | | | Use `started` key to show the triggered dateFilipa Lacerda2018-06-052-3/+9
* | | | | Merge branch '25045-add-variables-to-post-pipeline-api' into 'master'Grzegorz Bizon2018-06-064-2/+71
|\ \ \ \ \
| * | | | | Removes variables from pipelines apiJacopo2018-06-053-5/+14
| * | | | | Review 1Jacopo2018-06-013-8/+29
| * | | | | Rename variables_attributes => variables and adds spec for exclude/only optionJacopo2018-06-013-6/+21
| * | | | | Adds variables to POST api/v4/projects/:id/pipelineJacopo2018-06-015-2/+26
* | | | | | Merge branch 'rails5-fix-47368' into 'master'Rémy Coutable2018-06-062-3/+20
|\ \ \ \ \ \
| * | | | | | Rails 5 fix unknown keywords: changes, key_id, project, gl_repository, action...Jasper Maes2018-06-062-3/+20
* | | | | | | Merge branch 'blackst0ne-rails5-fix-specs-with-text-plain-charset-utf-8' into...Rémy Coutable2018-06-061-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | [Rails5] Fix response headers sending through workhorseblackst0ne2018-06-061-1/+1
* | | | | | | Merge branch 'blackst0ne-rails5-fix-url_for-in-app-views-admin-runners-index-...Rémy Coutable2018-06-061-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [Rails5] Replace `params` with `safe_params` in app/views/admin/runners/index...blackst0ne2018-06-061-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'rs-markdown-spec-performance' into 'master'Rémy Coutable2018-06-061-107/+97
|\ \ \ \ \ \ \
| * | | | | | | Combine multiple `it` blocks to improve Markdown feature spec timesRobert Speicher2018-06-051-107/+97
* | | | | | | | Merge branch '5941-extract-ee-controllers' into 'master'Rémy Coutable2018-06-062-2/+9
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Backport changes to app/controllers/groups/milestones_controller.rb5941-extract-ee-controllersMario de la Ossa2018-06-041-1/+4
| * | | | | | | Backport changes to app/controllers/groups/group_members_controller.rbMario de la Ossa2018-06-041-1/+5
* | | | | | | | Merge branch 'jr-registry-server-debug-docs' into 'master'Stan Hu2018-06-061-0/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Add ruby Markdown typeStan Hu2018-06-061-1/+1
| * | | | | | | | Move section to basic troubleshootingJames Ramsay2018-06-061-18/+18
| * | | | | | | | Add registry debug server docsJames Ramsay2018-06-051-0/+19
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'sh-fix-importer-status' into 'master'Clement Ho2018-06-064-9/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix invisible rows on importer statusStan Hu2018-06-064-9/+9
|/ / / / / / / /
* | | | | | | | Merge branch 'fix-card-header-text-color' into 'master'Annabel Gray2018-06-061-0/+10
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix card header text colorClement Ho2018-06-051-0/+10
| | |_|_|_|_|/ | |/| | | | |