summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add remove_foreign_key_if_existsce-11099-removing-the-project-that-holds-the-insights-configuration-raises-an-errorLin Jen-Shin2019-05-071-0/+6
* 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add issue template for refactoringswinh-refactoring-issue-template-docsWinnie Hellmann2019-04-301-0/+41
* | | | | | | | | | Merge branch 'member-access-granted-leave-email-fe' into 'master'Fatih Acet2019-05-0612-8/+110
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add leave link to access_granted emailmember-access-granted-leave-email-feLuke Bennett2019-05-0312-8/+110
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ce-mw-onboarding-mvc' into 'master'Fatih Acet2019-05-062-0/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Onboarding welcome pageMartin Wortschack2019-05-062-0/+34
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '51963-support-prometheus-for-group-level-clusters' into 'master'Fatih Acet2019-05-063-2/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Resolve "Support Prometheus for group-level clusters"Peter Leitzen2019-05-063-2/+6
|/ / / / / / / / /
* | | | | | | | | Merge branch 'graphql-resolvers-complexity' into 'master'Ash McKenzie2019-05-0612-4/+146
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | GraphQL - Add extra complexity for resolversJan Provaznik2019-05-0612-4/+146
|/ / / / / / / /
* | | | | | | | Merge branch 'add-spec-for-optimistic-locking-error' into 'master'Mayra Cabrera2019-05-063-0/+65
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix editing issues and MRs with NULL lock_versionSean McGivern2019-05-063-0/+65
|/ / / / / / / /
* | | | | | | | Merge branch 'upgrade-gitlab-ui' into 'master'Clement Ho2019-05-062-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Upgrade GitLab UI to 3.10.0upgrade-gitlab-uiLukas Eipert2019-05-062-5/+5
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'issue_57906_fix_github_import' into 'master'Sean McGivern2019-05-0611-1/+169
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix issuables state_id nil when importing projects from GitHubFelipe Artur2019-05-0611-1/+169
|/ / / / / / / /
* | | | | | | | Merge branch 'ce-11194-fix-approvals-groups-all-available' into 'master'Fatih Acet2019-05-061-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add close_select2 method to select2_helperce-11194-fix-approvals-groups-all-availablePaul Slaughter2019-05-011-0/+4
* | | | | | | | Merge branch 'add-mayra-cabrera-to-codeowners' into 'master'Sean McGivern2019-05-061-2/+2
|\ \ \ \ \ \ \ \