| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix typo in Pipelines empty state view | Mark Fletcher | 2018-05-25 | 1 | -1/+1 |
| | | |||||
| * | Merge branch '45850-close-mr-checkout-modal-on-escape' into 'master' | Mike Greiling | 2018-05-24 | 1 | -0/+24 |
| |\ | | | | | | | | | | | | | Resolve "Escape key to close MR check out branch modal" Closes #45850 See merge request gitlab-org/gitlab-ce!19050 | ||||
| | * | Closes MR check out branch modal with escape | Jacopo | 2018-05-22 | 1 | -0/+24 |
| | | | |||||
| * | | Merge branch ↵ | Douwe Maan | 2018-05-23 | 4 | -102/+209 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | '45175-cache-json-instead-of-activerecord-objects-in-appearance-and-applicationsetting' into 'master' Resolve "Cache JSON instead of ActiveRecord objects in `Appearance` and `ApplicationSetting`" Closes #45175 See merge request gitlab-org/gitlab-ce!18754 | ||||
| | * | | Simplify Gitlab::CurrentSettings now that the logic is in CacheableAttributes | Rémy Coutable | 2018-05-23 | 1 | -50/+51 |
| | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | Use the new CacheableAttributes concern in the ApplicationSetting and ↵ | Rémy Coutable | 2018-05-23 | 2 | -52/+5 |
| | | | | | | | | | | | | | | | | | | | Appearance models Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | Introduce a new CacheableAttributes concern | Rémy Coutable | 2018-05-23 | 1 | -0/+153 |
| | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | Merge branch 'fix/devops-remove-beta' into 'master' | Tim Zallmann | 2018-05-23 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | removed "(Beta)" from "Auto DevOps" messages See merge request gitlab-org/gitlab-ce!18759 | ||||
| | * | | | 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 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Prometheus integration fails on k8s 1.10" Closes #46259 See merge request gitlab-org/gitlab-ce!19082 | ||||
| | * | | | | 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 See merge request gitlab-org/gitlab-ce!18865 | ||||
| | * | | | | skip email trim when email is creating new issue | Cameron Crockett | 2018-05-22 | 3 | -2/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates from MR discussion 1. Added test for ReplyParser 2. Changed param to trim_reply with default set as true Removed keyword param in favor of normal options param updates for MR discussion Resolutions for code review comments more code review fixes | ||||
| * | | | | | 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 web IDE review & commit editors getting into incorrect state Closes #46392 See merge request gitlab-org/gitlab-ce!19038 | ||||
| | * | | | | | 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 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipelines store actions & states in web IDE Closes #44604 See merge request gitlab-org/gitlab-ce!18912 | ||||
| | * | | | | | | group jobs into stageside-jobs-list | Phil Hughes | 2018-05-22 | 4 | -13/+128 |
| | | | | | | | | |||||
| | * | | | | | | added getter for checking is their is a pipeline | Phil Hughes | 2018-05-22 | 2 | -1/+47 |
| | | | | | | | | |||||
| | * | | | | | | Show CI jobs in web IDE | Phil Hughes | 2018-05-22 | 4 | -2/+366 |
| | | |_|/ / / | |/| | | | | | | | | | | | | | | | | Closes #44604 | ||||
| * | | | | | | Merge branch 'ide-file-finder-improve-order' into 'master' | Filipa Lacerda | 2018-05-23 | 1 | -0/+6 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | Fixed IDE file finder ordering See merge request gitlab-org/gitlab-ce!18948 | ||||
| | * | | | | | changed what bit of code stops the callbackide-file-finder-improve-order | Phil Hughes | 2018-05-22 | 1 | -0/+6 |
| | | | | | | | |||||
| * | | | | | | Merge branch '44895-explicit-merge-conflict' into 'master' | Tim Zallmann | 2018-05-22 | 1 | -3/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Make explicit that merge conflict feature commits to source branch" Closes #44895 See merge request gitlab-org/gitlab-ce!18921 | ||||
| | * | | | | | | Make it explicit that merge conflict feature commits to source branch | Annabel Dunstone Gray | 2018-05-21 | 1 | -3/+3 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'dm-xcode-project-directory' into 'master' | Robert Speicher | 2018-05-22 | 1 | -7/+7 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Xcode project detection by looking for dirs instead of files See merge request gitlab-org/gitlab-ce!19035 | ||||
| | * | | | | | | | Fix Xcode project detection by looking for dirs instead of filesdm-xcode-project-directory | Douwe Maan | 2018-05-22 | 1 | -7/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch ↵ | Douwe Maan | 2018-05-22 | 2 | -33/+82 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '22846-notifications-broken-during-email-address-change-before-email-confirmed' into 'master' Resolve "notifications broken during email address change before email confirmed" Closes #22846 See merge request gitlab-org/gitlab-ce!18474 | ||||
| | * | | | | | | | | Don't set the notification_email when only unconfirmed_email is changed22846-notifications-broken-during-email-address-change-before-email-confirmed | Rémy Coutable | 2018-05-22 | 2 | -33/+82 |
| | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | Merge branch 'ce-6114-move-some-features-projects-specs' into 'master' | Rémy Coutable | 2018-05-22 | 1 | -0/+18 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Resolve "Extract EE specific files/lines for some projects features specs" See merge request gitlab-org/gitlab-ce!19084 | ||||
| | * | | | | | | | | Unify spec/features/projects/blobs/blob_show_spec.rb | Lin Jen-Shin | 2018-05-22 | 1 | -0/+18 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch 'ab-42194-keyset-pagination' into 'master' | Yorick Peterse | 2018-05-22 | 1 | -8/+204 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Keyset pagination support Closes #45756 See merge request gitlab-org/gitlab-ce!18584 | ||||
| | * | | | | | | | | Add keyset pagination for API calls. | Andreas Brandl | 2018-05-21 | 1 | -8/+204 |
| | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Closes #45756. | ||||
| * | | | | | | | | Expose readme url in Project API | Imre Farkas | 2018-05-22 | 5 | -4/+34 |
| | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | | Merge branch 'rename-merge-request-widget-author-component' into 'master' | Phil Hughes | 2018-05-22 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename merge request widget author component See merge request gitlab-org/gitlab-ce!19079 | ||||
| | * | | | | | | | Rename merge request widget author component | George Tsiolis | 2018-05-22 | 1 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix `expose_url` helper does not include custom base url if it is set | Francisco Javier López | 2018-05-22 | 1 | -2/+14 |
| | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | | Renamed 'Overview' to 'Project' in collapsed contextual navigation at a ↵ | Constance Okoghenun | 2018-05-21 | 2 | -3/+3 |
| | |/ / / / / |/| | | | | | | | | | | | | | | | | | project level | ||||
| * | | | | | | Merge branch 'ce-5928-geo-rake-task-to-force-housekeeping-on-next-sync' into ↵ | Nick Thomas | 2018-05-21 | 1 | -0/+4 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Backport from EE: Adding Progressbar explicitly and spec extensions for it See merge request gitlab-org/gitlab-ce!18885 | ||||
| | * | | | | | Adding progressbar explicitly and spec extensions for itce-5928-geo-rake-task-to-force-housekeeping-on-next-sync | Gabriel Mazetto | 2018-05-10 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'create-live-trace-only-if-job-is-complete' into 'master' | Kamil Trzciński | 2018-05-21 | 1 | -0/+16 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Append trace chunk only if job is running Closes #46383 See merge request gitlab-org/gitlab-ce!18969 | ||||
| | * | | | | | | Add test for the cancelled jobs | Shinya Maeda | 2018-05-21 | 1 | -0/+16 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'fix/gb/exclude-persisted-variables-from-environment-name' into ↵ | Grzegorz Bizon | 2018-05-21 | 3 | -3/+57 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Do not allow to use `CI_PIPELINE_ID` in environment name Closes #46443 See merge request gitlab-org/gitlab-ce!19032 | ||||
| | * | | | | | | | Fix Rubocop offense in create pipeline services :cop:fix/gb/exclude-persisted-variables-from-environment-name | Grzegorz Bizon | 2018-05-21 | 1 | -1/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Update pipeline persisted / predefined variables specs | Grzegorz Bizon | 2018-05-18 | 2 | -4/+8 |
| | | | | | | | | | |||||
| | * | | | | | | | Separate persisted and runtime pipeline variables | Grzegorz Bizon | 2018-05-18 | 2 | -1/+28 |
| | | | | | | | | | |||||
| | * | | | | | | | Do not allow to use `CI_PIPELINE_ID` in environment name | Grzegorz Bizon | 2018-05-18 | 1 | -0/+22 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch '46082-runner-contacted_at-is-not-always-a-time-type' into 'master' | Kamil Trzciński | 2018-05-21 | 1 | -11/+72 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Runner#contacted_at is not always a Time type" Closes #46082 See merge request gitlab-org/gitlab-ce!18810 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |