Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '5845-extract-ee-environments-files' into 'master' | Phil Hughes | 2018-05-21 | 3 | -27/+19 |
|\ | |||||
| * | Merge branch 'master' into 5845-extract-ee-environments-files5845-extract-ee-environments-files | Filipa Lacerda | 2018-05-18 | 45 | -456/+611 |
| |\ | |||||
| * | | Update method name | Filipa Lacerda | 2018-05-17 | 2 | -4/+4 |
| * | | [ci skip] Merge branch 'master' into 5845-extract-ee-environments-files | Filipa Lacerda | 2018-05-17 | 23 | -62/+148 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into 5845-extract-ee-environments-files | Filipa Lacerda | 2018-05-16 | 26 | -116/+270 |
| |\ \ \ | |||||
| * | | | | Replace vue resource with axios for environments | Filipa Lacerda | 2018-05-14 | 3 | -23/+15 |
* | | | | | Merge branch '44799-api-naming-issue-scope' into 'master' | Rémy Coutable | 2018-05-21 | 3 | -6/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Add created_by_me and assigned_to_me scopes44799-api-naming-issue-scope | Mark Chao | 2018-05-21 | 3 | -6/+7 |
* | | | | | | Merge branch '45065-users-projects-json-sort' into 'master' | Rémy Coutable | 2018-05-21 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Order UsersController#projects.json by updated_at | Takuya Noguchi | 2018-05-19 | 1 | -1/+1 |
* | | | | | | | Rescue Kubeclient::HttpError when generating prometheus_client | Shinya Maeda | 2018-05-21 | 1 | -0/+5 |
* | | | | | | | Merge branch 'docs/fix-chmod' into 'master' | Stan Hu | 2018-05-18 | 1 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Chmod 644 on offending filesdocs/fix-chmod | Achilleas Pipinellis | 2018-05-18 | 1 | -0/+0 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'update-cicd-icon' into 'master' | Mike Greiling | 2018-05-18 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Update CICD to use rocket iconupdate-cicd-icon | Joshua Lambert | 2018-05-17 | 1 | -1/+1 |
* | | | | | | Merge branch 'dz-refactor-lists-css' into 'master' | Annabel Gray | 2018-05-18 | 2 | -228/+228 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Move group lists css from framework/lists.scss to pages/groups.scssdz-refactor-lists-css | Dmitriy Zaporozhets | 2018-05-18 | 2 | -228/+228 |
* | | | | | | | Merge branch 'ide-sidebar-spacing' into 'master' | Filipa Lacerda | 2018-05-18 | 4 | -45/+63 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fixed up spacing above & below listside-sidebar-spacing | Phil Hughes | 2018-05-17 | 1 | -1/+8 |
| * | | | | | | | fixed spacing of icon & dropdown button | Phil Hughes | 2018-05-10 | 1 | -1/+0 |
| * | | | | | | | changed padding in headers | Phil Hughes | 2018-05-09 | 1 | -2/+2 |
| * | | | | | | | fixed up spacing throughout sidebars | Phil Hughes | 2018-05-09 | 4 | -43/+56 |
| * | | | | | | | Fixed inconsistent spacing in web IDE sidebar | Phil Hughes | 2018-05-09 | 1 | -4/+3 |
* | | | | | | | | Merge branch 'fix/gb/not-allow-to-trigger-skipped-manual-actions' into 'master' | Kamil Trzciński | 2018-05-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Do not allow to trigger manual actions that were skipped | Grzegorz Bizon | 2018-05-16 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'rs-milestones-base-service-parity' into 'master' | Rémy Coutable | 2018-05-18 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Bring CE-EE parity to app/services/milestones/base_service.rbrs-milestones-base-service-parity | Robert Speicher | 2018-05-17 | 1 | -0/+1 |
* | | | | | | | | | | Merge branch 'rs-unlock-file-service-parity' into 'master' | Rémy Coutable | 2018-05-18 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Bring CE-EE parity to app/services/lfs/unlock_file_service.rbrs-unlock-file-service-parity | Robert Speicher | 2018-05-17 | 1 | -4/+4 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Resolve "Web IDE: Previewing Markdown in Firefox doesn’t show a scroll bar" | André Luís | 2018-05-18 | 1 | -6/+12 |
* | | | | | | | | | Add Keyboard shortcuts for "Kubernetes" and "Environments" | Lukas Eipert | 2018-05-18 | 3 | -4/+17 |
| |_|_|/ / / / / |/| | | | | | | | |||||
* | | | | | | | | fix / assigne username wrapping problem has been fixed | Murat Dogan | 2018-05-17 | 1 | -3/+15 |
* | | | | | | | | Merge branch '39584-nesting-depth-5-pages-pipelines' into 'master' | Annabel Gray | 2018-05-17 | 1 | -37/+21 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Apply NestingDepth (level 5) (pages/pipelines.scss) | Takuya Noguchi | 2018-05-12 | 1 | -37/+21 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'dz-fix-list-bottom-margin' into 'master' | Annabel Gray | 2018-05-17 | 2 | -10/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix group lists visualdz-fix-list-bottom-margin | Dmitriy Zaporozhets | 2018-05-17 | 2 | -10/+5 |
* | | | | | | | | | Merge branch '46193-fix-big-estimate' into 'master' | Rémy Coutable | 2018-05-17 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fixes 500 error on /estimate BIG_VALUE | Jacopo | 2018-05-17 | 1 | -0/+4 |
* | | | | | | | | | | Merge branch '46381-dropdown-mr-widget' into 'master' | Annabel Gray | 2018-05-17 | 10 | -70/+90 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into 46381-dropdown-mr-widget46381-dropdown-mr-widget | Filipa Lacerda | 2018-05-17 | 36 | -167/+300 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix eslint | Filipa Lacerda | 2018-05-17 | 2 | -2/+2 |
| * | | | | | | | | | | Moves string to a constant | Filipa Lacerda | 2018-05-17 | 3 | -3/+6 |
| * | | | | | | | | | | Reloads pipeline table when dropdown action is clicked and closes the dropdow... | Filipa Lacerda | 2018-05-16 | 3 | -15/+12 |
| * | | | | | | | | | | [ci skip] Merge branch 'master' into 46381-dropdown-mr-widget | Filipa Lacerda | 2018-05-16 | 8 | -15/+35 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Handles action icons requests in a contained way and shows a loading icon to ... | Filipa Lacerda | 2018-05-15 | 8 | -72/+92 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Fix: Use case in-sensitive ordering by name for groups | Harish Ved | 2018-05-17 | 1 | -2/+2 |
* | | | | | | | | | | | Merge branch '6020-extract-ee-specific-controller-lines' into 'master' | Robert Speicher | 2018-05-17 | 6 | -5/+32 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Backport changes from EE to minimize the CE/EE diff in Projects::Settings::In...6020-extract-ee-specific-controller-lines | Rémy Coutable | 2018-05-16 | 2 | -2/+17 |
| * | | | | | | | | | | | Introduce a new Keys::DestroyService service | Rémy Coutable | 2018-05-16 | 3 | -2/+14 |
| * | | | | | | | | | | | Add :weight as an allowed serializable field in app/controllers/boards/issues... | Rémy Coutable | 2018-05-16 | 1 | -1/+1 |