Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '46740-projectmilestones-setting-start_date-via-the-api-requires... | Rémy Coutable | 2018-05-25 | 1 | -0/+6 |
|\ | |||||
| * | Allow start_date as only parameter when updating Milestone via API | Mark Fletcher | 2018-05-24 | 1 | -0/+6 |
* | | Merge branch '46600-fix-gitlab-revision-when-not-in-git-repo' into 'master' | Rémy Coutable | 2018-05-25 | 5 | -4/+64 |
|\ \ | |||||
| * | | Replace Gitlab::REVISION with Gitlab.revision and handle installations withou...46600-fix-gitlab-revision-when-not-in-git-repo | Rémy Coutable | 2018-05-24 | 5 | -4/+64 |
| |/ | |||||
* | | Merge branch '46768-typo-on-the-empty-pipelines-page' into 'master' | Filipa Lacerda | 2018-05-25 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix typo in Pipelines empty state view | Mark Fletcher | 2018-05-25 | 1 | -1/+1 |
| |/ | |||||
* | | Resolve "Show CI pipeline status in Web IDE" | André Luís | 2018-05-25 | 4 | -19/+231 |
* | | Merge branch 'migrate-restore-repo-to-gitaly' into 'master' | Douwe Maan | 2018-05-24 | 1 | -26/+3 |
|\ \ | |||||
| * | | Fix failing specs | Ahmad Hassan | 2018-05-16 | 1 | -26/+3 |
* | | | Merge branch 'dz-refactor-cluster-apps-schedule' into 'master' | Douwe Maan | 2018-05-24 | 1 | -18/+15 |
|\ \ \ | |||||
| * | | | Refactor code around scheduling cluster installationsdz-refactor-cluster-apps-schedule | Dmitriy Zaporozhets | 2018-05-24 | 1 | -18/+15 |
* | | | | Merge branch 'ce-6127-move-merge-requests-services' into 'master' | Rémy Coutable | 2018-05-24 | 1 | -2/+7 |
|\ \ \ \ | |||||
| * | | | | Avoid using expect_any_instance_of | Lin Jen-Shin | 2018-05-23 | 1 | -2/+7 |
* | | | | | Merge branch 'issue_38418' into 'master' | Rémy Coutable | 2018-05-24 | 1 | -9/+42 |
|\ \ \ \ \ | |||||
| * | | | | | Fix sidebar issue countissue_38418 | Felipe Artur | 2018-05-24 | 1 | -9/+42 |
* | | | | | | Merge branch '5779_rename_code_quality_job_and_artifact' into 'master' | Achilleas Pipinellis | 2018-05-24 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Rename code quality job and artifact. Refs gitlab-org/gitlab-ee#5779 | Olivier Gonzalez | 2018-05-23 | 1 | -1/+1 |
* | | | | | | | Fix backup creation and restore for specific Rake tasks | Stan Hu | 2018-05-24 | 3 | -6/+17 |
* | | | | | | | Merge branch 'ce-jej/saml-failure-messages' into 'master' | Grzegorz Bizon | 2018-05-24 | 2 | -0/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Backport helpers from GroupSAML failure messagesce-jej/saml-failure-messages | James Edwards-Jones | 2018-05-21 | 2 | -0/+15 |
* | | | | | | | | Merge branch 'fl-loading-icon' into 'master' | Phil Hughes | 2018-05-24 | 1 | -1/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Show loading icon only when making the requestfl-loading-icon | Filipa Lacerda | 2018-05-23 | 1 | -1/+10 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'mr-conflict-notification' into 'master' | Douwe Maan | 2018-05-24 | 10 | -60/+238 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add spec | Mark Chao | 2018-05-24 | 1 | -22/+34 |
| * | | | | | | | | Plural reason(s) | Mark Chao | 2018-05-18 | 1 | -0/+1 |
| * | | | | | | | | Create TODO when MR became unmergeable | lulalala | 2018-05-17 | 2 | -34/+17 |
| * | | | | | | | | Notify with email when merge request became unmergeable | lulalala | 2018-05-17 | 3 | -0/+100 |
| * | | | | | | | | Add MergeRequest#merge_participants | lulalala | 2018-05-17 | 1 | -0/+35 |
| * | | | | | | | | Add cannot_be_merged_recheck merge_status | lulalala | 2018-05-17 | 5 | -4/+51 |
* | | | | | | | | | Merge branch 'jprovazn-fix-resolvable' into 'master' | Douwe Maan | 2018-05-24 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Check if note's noteable is not nil when checking resolvabilityjprovazn-fix-resolvable | Jan Provaznik | 2018-05-23 | 1 | -0/+8 |
* | | | | | | | | | Merge branch '45850-close-mr-checkout-modal-on-escape' into 'master' | Mike Greiling | 2018-05-24 | 1 | -0/+24 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Closes MR check out branch modal with escape | Jacopo | 2018-05-22 | 1 | -0/+24 |
* | | | | | | | | | Merge branch '45175-cache-json-instead-of-activerecord-objects-in-appearance-... | Douwe Maan | 2018-05-23 | 4 | -102/+209 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Simplify Gitlab::CurrentSettings now that the logic is in CacheableAttributes | Rémy Coutable | 2018-05-23 | 1 | -50/+51 |
| * | | | | | | | | | Use the new CacheableAttributes concern in the ApplicationSetting and Appeara... | Rémy Coutable | 2018-05-23 | 2 | -52/+5 |
| * | | | | | | | | | Introduce a new CacheableAttributes concern | Rémy Coutable | 2018-05-23 | 1 | -0/+153 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'fix/devops-remove-beta' into 'master' | Tim Zallmann | 2018-05-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | removed "(Beta)" from "Auto DevOps" messagesfix/devops-remove-beta | Paul Slaughter | 2018-05-21 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch '46259-prometheus-integration-fails-on-kube-1-10' into 'master' | Rémy Coutable | 2018-05-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Update Prometheus URL spec for 1.10 format | Joshua Lambert | 2018-05-22 | 1 | -1/+1 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Render 404 when prometheus adapter is disabled in Prometheus metrics controller | Tiago Botelho | 2018-05-23 | 1 | -25/+48 |
| |_|/ / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge branch 'issue-25256' into 'master' | Douwe Maan | 2018-05-23 | 3 | -2/+55 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | skip email trim when email is creating new issue | Cameron Crockett | 2018-05-22 | 3 | -2/+55 |
* | | | | | | | | | | Resolve "Deprecate Gemnasium project service" | Olivier Gonzalez | 2018-05-23 | 2 | -24/+29 |
* | | | | | | | | | | Resolve "Web IDE doesn't work for branches with slashes" | Tim Zallmann | 2018-05-23 | 1 | -2/+8 |
* | | | | | | | | | | Merge branch 'ide-commit-state-bug' into 'master' | Filipa Lacerda | 2018-05-23 | 1 | -0/+20 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fixed spec | Phil Hughes | 2018-05-23 | 1 | -0/+1 |
| * | | | | | | | | | | added specide-commit-state-bug | Phil Hughes | 2018-05-22 | 1 | -0/+19 |
* | | | | | | | | | | | Merge branch 'ide-jobs-list' into 'master' | Filipa Lacerda | 2018-05-23 | 5 | -2/+527 |
|\ \ \ \ \ \ \ \ \ \ \ |