summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '5845-extract-ee-environments-files' into 'master'Phil Hughes2018-05-213-27/+19
|\
| * Merge branch 'master' into 5845-extract-ee-environments-files5845-extract-ee-environments-filesFilipa Lacerda2018-05-1845-456/+611
| |\
| * | Update method nameFilipa Lacerda2018-05-172-4/+4
| * | [ci skip] Merge branch 'master' into 5845-extract-ee-environments-filesFilipa Lacerda2018-05-1723-62/+148
| |\ \
| * \ \ Merge branch 'master' into 5845-extract-ee-environments-filesFilipa Lacerda2018-05-1626-116/+270
| |\ \ \
| * | | | Replace vue resource with axios for environmentsFilipa Lacerda2018-05-143-23/+15
* | | | | Merge branch '44799-api-naming-issue-scope' into 'master'Rémy Coutable2018-05-213-6/+7
|\ \ \ \ \
| * | | | | Add created_by_me and assigned_to_me scopes44799-api-naming-issue-scopeMark Chao2018-05-213-6/+7
* | | | | | Merge branch '45065-users-projects-json-sort' into 'master'Rémy Coutable2018-05-211-1/+1
|\ \ \ \ \ \
| * | | | | | Order UsersController#projects.json by updated_atTakuya Noguchi2018-05-191-1/+1
* | | | | | | Rescue Kubeclient::HttpError when generating prometheus_clientShinya Maeda2018-05-211-0/+5
* | | | | | | Merge branch 'docs/fix-chmod' into 'master'Stan Hu2018-05-181-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Chmod 644 on offending filesdocs/fix-chmodAchilleas Pipinellis2018-05-181-0/+0
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'update-cicd-icon' into 'master'Mike Greiling2018-05-181-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update CICD to use rocket iconupdate-cicd-iconJoshua Lambert2018-05-171-1/+1
* | | | | | Merge branch 'dz-refactor-lists-css' into 'master'Annabel Gray2018-05-182-228/+228
|\ \ \ \ \ \
| * | | | | | Move group lists css from framework/lists.scss to pages/groups.scssdz-refactor-lists-cssDmitriy Zaporozhets2018-05-182-228/+228
* | | | | | | Merge branch 'ide-sidebar-spacing' into 'master'Filipa Lacerda2018-05-184-45/+63
|\ \ \ \ \ \ \
| * | | | | | | fixed up spacing above & below listside-sidebar-spacingPhil Hughes2018-05-171-1/+8
| * | | | | | | fixed spacing of icon & dropdown buttonPhil Hughes2018-05-101-1/+0
| * | | | | | | changed padding in headersPhil Hughes2018-05-091-2/+2
| * | | | | | | fixed up spacing throughout sidebarsPhil Hughes2018-05-094-43/+56
| * | | | | | | Fixed inconsistent spacing in web IDE sidebarPhil Hughes2018-05-091-4/+3
* | | | | | | | Merge branch 'fix/gb/not-allow-to-trigger-skipped-manual-actions' into 'master'Kamil Trzciński2018-05-181-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Do not allow to trigger manual actions that were skippedGrzegorz Bizon2018-05-161-1/+1
* | | | | | | | | Merge branch 'rs-milestones-base-service-parity' into 'master'Rémy Coutable2018-05-181-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bring CE-EE parity to app/services/milestones/base_service.rbrs-milestones-base-service-parityRobert Speicher2018-05-171-0/+1
* | | | | | | | | | Merge branch 'rs-unlock-file-service-parity' into 'master'Rémy Coutable2018-05-181-4/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Bring CE-EE parity to app/services/lfs/unlock_file_service.rbrs-unlock-file-service-parityRobert Speicher2018-05-171-4/+4
| |/ / / / / / / /
* | | | | | | | | Resolve "Web IDE: Previewing Markdown in Firefox doesn’t show a scroll bar"André Luís2018-05-181-6/+12
* | | | | | | | | Add Keyboard shortcuts for "Kubernetes" and "Environments"Lukas Eipert2018-05-183-4/+17
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | fix / assigne username wrapping problem has been fixedMurat Dogan2018-05-171-3/+15
* | | | | | | | Merge branch '39584-nesting-depth-5-pages-pipelines' into 'master'Annabel Gray2018-05-171-37/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Apply NestingDepth (level 5) (pages/pipelines.scss)Takuya Noguchi2018-05-121-37/+21
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'dz-fix-list-bottom-margin' into 'master'Annabel Gray2018-05-172-10/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix group lists visualdz-fix-list-bottom-marginDmitriy Zaporozhets2018-05-172-10/+5
* | | | | | | | | Merge branch '46193-fix-big-estimate' into 'master'Rémy Coutable2018-05-171-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixes 500 error on /estimate BIG_VALUEJacopo2018-05-171-0/+4
* | | | | | | | | | Merge branch '46381-dropdown-mr-widget' into 'master'Annabel Gray2018-05-1710-70/+90
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into 46381-dropdown-mr-widget46381-dropdown-mr-widgetFilipa Lacerda2018-05-1736-167/+300
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix eslintFilipa Lacerda2018-05-172-2/+2
| * | | | | | | | | | Moves string to a constantFilipa Lacerda2018-05-173-3/+6
| * | | | | | | | | | Reloads pipeline table when dropdown action is clicked and closes the dropdow...Filipa Lacerda2018-05-163-15/+12
| * | | | | | | | | | [ci skip] Merge branch 'master' into 46381-dropdown-mr-widgetFilipa Lacerda2018-05-168-15/+35
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Handles action icons requests in a contained way and shows a loading icon to ...Filipa Lacerda2018-05-158-72/+92
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Fix: Use case in-sensitive ordering by name for groupsHarish Ved2018-05-171-2/+2
* | | | | | | | | | | Merge branch '6020-extract-ee-specific-controller-lines' into 'master'Robert Speicher2018-05-176-5/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Backport changes from EE to minimize the CE/EE diff in Projects::Settings::In...6020-extract-ee-specific-controller-linesRémy Coutable2018-05-162-2/+17
| * | | | | | | | | | | Introduce a new Keys::DestroyService serviceRémy Coutable2018-05-163-2/+14
| * | | | | | | | | | | Add :weight as an allowed serializable field in app/controllers/boards/issues...Rémy Coutable2018-05-161-1/+1