summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixes empty block in MR widget60462-empty-pipeline-sectionFilipa Lacerda2019-05-074-2/+40
* Merge branch 'gitaly-version-v1.42.0' into 'master'Douwe Maan2019-05-072-1/+6
|\
| * Upgrade Gitaly to v1.42.0GitalyBot2019-05-072-1/+6
|/
* Merge branch 'dz-registry-proxy-ui-ce' into 'master'Tim Zallmann2019-05-071-0/+1
|\
| * Backport change to group sidebardz-registry-proxy-ui-cemfluharty2019-05-011-0/+1
* | Merge branch 'sh-cleanup-import-export' into 'master'James Lopez2019-05-073-4/+37
|\ \
| * | Clean up CarrierWave's import/export filesStan Hu2019-05-073-4/+37
* | | Merge branch 'friendly-wrap-component' into 'master'Tim Zallmann2019-05-072-0/+9
|\ \ \
| * | | Add wbr style for IE11 compatibilityfriendly-wrap-componentPaul Gascou-Vaillancourt2019-05-062-0/+9
* | | | Merge branch '59930-todos-scss' into 'master'Phil Hughes2019-05-072-35/+28
|\ \ \ \
| * | | | Cleans up todos.scss stylelint warnings59930-todos-scssFilipa Lacerda2019-05-032-35/+28
* | | | | Merge branch 'winh-separate-frontend-fixtures' into 'master'Phil Hughes2019-05-078-10/+22
|\ \ \ \ \
| * | | | | Load EE fixtures from ee/ directory in Jestwinh-separate-frontend-fixturesWinnie Hellmann2019-05-022-4/+7
| * | | | | Load EE fixtures from ee/ directory in KarmaWinnie Hellmann2019-05-022-2/+7
| * | | | | Generate EE frontend fixtures into ee/ directoryWinnie Hellmann2019-05-021-1/+1
| * | | | | Allow to override Gitlab.ee? with IS_GITLAB_EEWinnie Hellmann2019-05-021-1/+5
| * | | | | Ignore PDF and balsamiq fixture filesWinnie Hellmann2019-05-022-2/+2
* | | | | | Merge branch '61278-next' into 'master'Phil Hughes2019-05-073-5/+23
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Only renders Next badge for gitlab.comFilipa Lacerda2019-05-073-5/+23
|/ / / / /
* | | | | Merge branch 'allow-replying-to-individual-notes-from-api' into 'master'James Lopez2019-05-075-11/+34
|\ \ \ \ \
| * | | | | Allow replying to an individual note in the APIallow-replying-to-individual-notes-from-apiSean McGivern2019-05-065-11/+34
* | | | | | Merge branch 'strip-attr-cron-in-pipeline-schedule' into 'master'Grzegorz Bizon2019-05-072-0/+12
|\ \ \ \ \ \
| * | | | | | Strip whitespace for PipelineSchedule#cronstrip-attr-cron-in-pipeline-scheduleFabio Pitino2019-05-022-0/+12
* | | | | | | Merge branch 'instance_level_clusters' into 'master'Bob Van Landuyt2019-05-0739-45/+1109
|\ \ \ \ \ \ \
| * | | | | | | Remove duplicate clusterable presenter methodinstance_level_clustersJames Fargher2019-05-075-26/+0
| * | | | | | | Convert instance level clusters enabled to class methodJames Fargher2019-05-073-7/+3
| * | | | | | | Change specs to match gitlab code standardsJames Fargher2019-05-073-19/+23
| * | | | | | | Stop using `go` function in clusters controller specsJames Fargher2019-05-071-54/+54
| * | | | | | | Check instance cluster feature at policy levelJames Fargher2019-05-0710-36/+107
| * | | | | | | Allow projects to use instance level clustersJames Fargher2019-05-077-11/+66
| * | | | | | | Instance level kubernetes clusters adminJames Fargher2019-05-0727-5/+969
* | | | | | | | Merge branch 'sh-fix-activerecord-patch-mark2' into 'master'Stan Hu2019-05-073-11/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | Additional fix to handle NULL lock_versionsh-fix-activerecord-patch-mark2Stan Hu2019-05-063-11/+37
* | | | | | | | | Merge branch 'sh-fix-ldap-members-icon-ce' into 'master'Kushal Pandya2019-05-072-4/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Backport members SCSS changessh-fix-ldap-members-icon-ceStan Hu2019-05-062-4/+1
* | | | | | | | | | Merge branch '56992-add-filtering-to-project-dashboard-fe' into 'master'Kushal Pandya2019-05-0723-51/+575
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Updated translation strings56992-add-filtering-to-project-dashboard-feEzekiel Kigbo2019-05-061-3/+0
| * | | | | | | | | | Cleanup css classes and stylesEzekiel Kigbo2019-05-066-30/+22
| * | | | | | | | | | Added blank lines to meet style guideEzekiel Kigbo2019-05-0614-79/+86
| * | | | | | | | | | Minor review fixesEzekiel Kigbo2019-05-0616-68/+82
| * | | | | | | | | | Update project list specsEzekiel Kigbo2019-05-068-114/+277
| * | | | | | | | | | Ensure we dont apply changes to admin/projectsEzekiel Kigbo2019-05-067-70/+121
| * | | | | | | | | | Added sorted_by_stars_asc scope to projects modelEzekiel Kigbo2019-05-061-0/+3
| * | | | | | | | | | Updated layout for various breakpointsEzekiel Kigbo2019-05-0612-74/+304
| * | | | | | | | | | Added filter bar to project pageEzekiel Kigbo2019-05-068-15/+82
* | | | | | | | | | | Merge branch 'fix-schedule-head-pipeline-update-method' into 'master'Ash McKenzie2019-05-073-19/+28
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix schedule head pipeline updatefix-schedule-head-pipeline-update-methodShinya Maeda2019-05-063-19/+28
* | | | | | | | | | | | Merge branch 'docs-destroy-the-mirrors' into 'master'Evan Read2019-05-072-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Correct repo mirror SSH key generation docsdocs-destroy-the-mirrorsLuke Bennett2019-05-032-2/+4
* | | | | | | | | | | | | Merge branch 'winh-refactoring-issue-template-docs' into 'master'Stan Hu2019-05-061-0/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \