| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Messaging on terms page when user already accepted46585-gdpr-terms-acceptance | tauriedavis | 2018-06-04 | 1 | -0/+16 |
| | | | | | | We show a blue flash banner if the user already accepted, and show a button allowing them to continue to the application. | ||||
| * | Merge branch '46010-add-more-validations-for-runners-and-runner-type' into ↵ | Kamil Trzciński | 2018-06-01 | 2 | -24/+22 |
| |\ | | | | | | | | | | | | | 'master' Improve validations for Ci::Runner#runner_type See merge request gitlab-org/gitlab-ce!18901 | ||||
| | * | Fix spec/features/runners_spec.rb | Dylan Griffith | 2018-05-31 | 1 | -2/+2 |
| | | | |||||
| | * | Refactor validations and make runner factory by default to be instance-wide ↵ | Kamil Trzciński | 2018-05-31 | 2 | -14/+12 |
| | | | | | | | | | runner | ||||
| | * | Improve runner_type validations for Ci::Runner | Dylan Griffith | 2018-05-31 | 2 | -12/+12 |
| | | | |||||
| * | | Merge branch '47046-use-sortable-from-npm' into 'master' | Phil Hughes | 2018-06-01 | 1 | -3/+4 |
| |\ \ | | | | | | | | | | | | | | | | | | | Use NPM provided version of SortableJS Closes #47046 See merge request gitlab-org/gitlab-ce!19274 | ||||
| | * | | Make simulateDrag duration configurable | Kushal Pandya | 2018-05-31 | 1 | -3/+4 |
| | |/ | |||||
| * | | Update 404 and 403 pages | Paul Slaughter | 2018-05-31 | 2 | -1/+43 |
| | | | |||||
| * | | Fix active tab styling | Annabel Gray | 2018-05-31 | 1 | -4/+4 |
| | | | |||||
| * | | Export assigned issues in iCalendar feed | Imre Farkas | 2018-05-31 | 23 | -63/+278 |
| |/ | |||||
| * | Simplify spec: `2.times.each` -> `2.times` | Stan Hu | 2018-05-30 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'sh-fix-submit-not-clearing-local-storage' into 'master' | Filipa Lacerda | 2018-05-30 | 2 | -1/+16 |
| |\ | | | | | | | | | | | | | Fix local storage not being cleared after creating a new issue Closes #37162 See merge request gitlab-org/gitlab-ce!19226 | ||||
| | * | Add a regression test for clearing local storage upon issue creation | Stan Hu | 2018-05-29 | 1 | -0/+14 |
| | | | |||||
| | * | Fix local storage not being cleared after creating a new issue | Stan Hu | 2018-05-29 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | Creating a new issue will always result in a 302 redirect to the newly-created issue. This reverts the change introduced in https://gitlab.com/gitlab-org/gitlab-ce/commit/7684217d6806408cd338260119364419260d1720 to handle the case where a user is in the middle of creating a new form and redirected to accepting the terms of service. Closes #37162 | ||||
| * | | Merge branch 'mattermost-api-v4' into 'master' | Sean McGivern | 2018-05-30 | 1 | -2/+2 |
| |\ \ | | | | | | | | | | | | | | | | | | | Updated Mattermost integration to use Mattermost API v4 Closes #41631 See merge request gitlab-org/gitlab-ce!19043 | ||||
| | * | | Updated help text for team list for Mattermost slash commands | Harrison Healey | 2018-05-29 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master' | Phil Hughes | 2018-05-30 | 1 | -0/+124 |
| |\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Resolve "Squash and merge in GitLab Core (CE)" Closes #34591 See merge request gitlab-org/gitlab-ce!18956 | ||||
| | * | | Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ce | blackst0ne | 2018-05-29 | 1 | -0/+124 |
| | |/ | |||||
| * | | Resolve "Merge request spinner spins forever after loading the diff" | Lukas Eipert | 2018-05-29 | 2 | -6/+14 |
| | | | |||||
| * | | Resolve "Operations navigation menu renders empty menu when user does not ↵ | Lukas Eipert | 2018-05-29 | 1 | -0/+12 |
| | | | | | | | | | have the right permissions" | ||||
| * | | Merge branch ↵ | Kamil Trzciński | 2018-05-29 | 1 | -110/+81 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | '38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster' into 'master' Resolve "Fetch available parameters directly from GKE when creating a cluster" Closes #38759 See merge request gitlab-org/gitlab-ce!17806 | ||||
| | * | | Check the GCP cluster form for the GCP token | Matija Čupić | 2018-05-28 | 1 | -1/+10 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'origin/master' into ↵ | Dennis Tang | 2018-05-25 | 50 | -320/+801 |
| | |\ \ | | |/ | | | | | | | 38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster | ||||
| | * | | Merge remote-tracking branch 'origin/master' into ↵ | Dennis Tang | 2018-05-11 | 43 | -442/+1707 |
| | |\ \ | | | | | | | | | | | | | 38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster | ||||
| | * | | | update rspec tests | Dennis Tang | 2018-05-07 | 1 | -3/+12 |
| | | | | | |||||
| | * | | | Merge branch 'master' into ↵ | Matija Čupić | 2018-05-02 | 24 | -353/+809 |
| | |\ \ \ | | | | | | | | | | | | | | | | 38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster | ||||
| | * | | | | Remove GCP Project list stub from GCP feature spec | Matija Čupić | 2018-05-02 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | Remove the GCP billing verification step | Matija Čupić | 2018-04-20 | 1 | -113/+67 |
| | | | | | | |||||
| | * | | | | Store projects in ListGcpProjectsWorker | Matija Čupić | 2018-04-20 | 1 | -6/+6 |
| | | | | | | |||||
| * | | | | | Merge branch 'dz-redesign-group-settings-page' into 'master' | Filipa Lacerda | 2018-05-29 | 4 | -19/+43 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Redesign group settings page into expandable sections See merge request gitlab-org/gitlab-ce!19184 | ||||
| | * | | | | | Fix tests after group settings page redesign | Dmitriy Zaporozhets | 2018-05-28 | 4 | -18/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | | Redesign group settings page into expandable sections | Dmitriy Zaporozhets | 2018-05-28 | 1 | -2/+4 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | Add helpful messages to empty wiki view | Paul Slaughter | 2018-05-29 | 5 | -0/+80 |
| |/ / / / | |||||
| * | | | | Merge branch 'winh-new-merge-request-encoding' into 'master' | Mike Greiling | 2018-05-25 | 1 | -2/+34 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix encoding of branch names on compare and new merge request page Closes #46627 See merge request gitlab-org/gitlab-ce!19143 | ||||
| | * | | | | Fix indentation in user_selects_branches_for_new_mr_spec.rbwinh-new-merge-request-encoding | Winnie Hellmann | 2018-05-25 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Add failing test for https://gitlab.com/gitlab-org/gitlab-ce/issues/46627 | Winnie Hellmann | 2018-05-25 | 1 | -2/+34 |
| | | | | | | |||||
| * | | | | | Fix login_spec | Annabel Dunstone Gray | 2018-05-25 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into bootstrap4 | Clement Ho | 2018-05-24 | 2 | -1/+25 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge branch 'mr-conflict-notification' into 'master' | Douwe Maan | 2018-05-24 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | MR unmergeable notification See merge request gitlab-org/gitlab-ce!18042 | ||||
| | | * | | | | Add cannot_be_merged_recheck merge_status | lulalala | 2018-05-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, transitions between can_be_merged & cannot_be_merged are removed, as they are currently blocked in `check_if_can_be_merged`. `can_be_merge` always returns to `unchecked` first, before it can transition to `cannot_be_merged` (and vice versa). We want to avoid repeated notification triggered by repeated transition between `cannot_be_merged` & `unchecked`. So we added `cannot_be_merged_recheck` state, similar to `unchecked`, but as a mean to remember it’s from cannot_be_merged. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18042/#note_65945407 Since `unchecked` and `cannot_be_merged_recheck` both mean “we are in the middle of checking if it is mergeable”, quite often we need to see if merge_status is in either one of them, so `check_state?` is added to achieve this. | ||||
| | * | | | | | 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 |
| | | | | | | | | |||||
| * | | | | | | | Fix pagination spec, forgot to add space | Clement Ho | 2018-05-24 | 2 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Replace data-test=page with .js-pagination-page | Clement Ho | 2018-05-24 | 2 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Test remove restore window size | Clement Ho | 2018-05-24 | 1 | -4/+0 |
| | | | | | | | | |||||
| * | | | | | | | fix protected_branches_spec.rb | Jose | 2018-05-23 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into bootstrap4 | Clement Ho | 2018-05-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | 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 'master' into bootstrap4 | Clement Ho | 2018-05-22 | 4 | -6/+24 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |