summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* View updateMark Chao2018-06-063-4/+4
* Rename “Developers + Masters”Mark Chao2018-06-061-2/+2
* Rename master to maintainerMark Chao2018-06-061-1/+1
* Merge branch 'sh-improve-import-status-error' into 'master'Fatih Acet2018-06-068-7/+19
|\
| * Simplify error message handling in Projects::CreateServiceStan Hu2018-06-062-7/+2
| * Show a more helpful error for import statusStan Hu2018-06-067-6/+23
* | Adjust monitoring graphs to support widgets in EEMike Greiling2018-06-063-5/+24
* | Merge branch 'secret-variables-name' into 'master'Marcia Ramos2018-06-062-2/+2
|\ \
| * | Rename Secret variables -> variablesAchilleas Pipinellis2018-06-062-2/+2
* | | Merge branch 'bvl-graphql-start-34754' into 'master'Douwe Maan2018-06-0622-0/+331
|\ \ \ | |/ / |/| |
| * | Initial setup GraphQL using graphql-ruby 1.8Bob Van Landuyt2018-06-0621-182/+218
| * | Handle exceptions outside the GraphQL schemaBob Van Landuyt2018-06-051-21/+17
| * | Add `present_using` to typesBob Van Landuyt2018-06-054-31/+48
| * | Convert from GraphQL::Batch to BatchLoaderNick Thomas2018-06-054-55/+32
| * | Add a minimal GraphQL APINick Thomas2018-06-0511-0/+305
* | | Merge branch 'ide-jobs-log' into 'master'Filipa Lacerda2018-06-0615-26/+358
|\ \ \
| * | | added empty statePhil Hughes2018-06-063-2/+7
| * | | 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-061-8/+5
| * | | store specsPhil Hughes2018-06-061-1/+1
| * | | 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 '47196-actionview-missingtemplate-missing-template-projects-merg...Grzegorz Bizon2018-06-061-22/+11
|\ \ \
| * | | 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
* | | | Merge branch '46858-triggered-at' into 'master'Kamil Trzciński2018-06-061-1/+4
|\ \ \ \
| * | | | Use `started` key to show the triggered dateFilipa Lacerda2018-06-051-1/+4
* | | | | 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 '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
* | | | | | Fix invisible rows on importer statusStan Hu2018-06-062-5/+5
* | | | | | 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
* | | | | | Merge branch 'fix-settings-spacing' into 'master'Annabel Gray2018-06-061-4/+0
|\ \ \ \ \ \
| * | | | | | Fix project settings > merge request settings spacingClement Ho2018-06-051-4/+0
| |/ / / / /
* | | | | | Fix MR tabs bottom borderClement Ho2018-06-061-0/+3
| |_|/ / / |/| | | |
* | | | | Merge branch '47049-performance-modal' into 'master'Mike Greiling2018-06-053-3/+19
|\ \ \ \ \
| * | | | | Improve modal prop interface47049-performance-modalClement Ho2018-06-041-3/+8
| * | | | | Use md as default modal sizeAnnabel Dunstone Gray2018-06-042-3/+3
| * | | | | Add class to fix wrappingAnnabel Dunstone Gray2018-06-012-1/+5