Age | Commit message (Collapse) | Author | |
---|---|---|---|
2018-05-04 | Merge branch 'feature/runner-per-group' into 'master' | Kamil Trzciński | |
Shared CI runners for groups See merge request gitlab-org/gitlab-ce!9646 | |||
2018-05-04 | Merge branch 'rs-remove-admin-user-badge-counts' into 'master' | Douwe Maan | |
Perform a limited count for the badge counts for tabs in the Users admin area Closes #33927 See merge request gitlab-org/gitlab-ce!18661 | |||
2018-05-03 | Merge branch 'ide-tree-changes-count' into 'master' | Filipa Lacerda | |
Added changes count to web IDE folder See merge request gitlab-org/gitlab-ce!18452 | |||
2018-05-03 | Remove a warning from spec/features/admin/admin_users_spec.rb | Robert Speicher | |
2018-05-03 | Revert "Use factory in specs for ProjectCiCdSettings" | Dylan Griffith | |
This reverts commit bf790c26c58e214c27132e7a54fdf4a4cc77bdaf. | |||
2018-05-03 | Fix Project#group_runners_enabled as it was doing nothing | Dylan Griffith | |
2018-05-03 | ensure users are signed out properly in user_uses_slash_commands_spec.rb | Lukas Eipert | |
See https://gitlab.com/gitlab-org/gitlab-ce/issues/45970 | |||
2018-05-03 | Merge branch '5480-sidebar-subscription-event-handling' into 'master' | Phil Hughes | |
Platform: Use component to emit event on Subscription toggle component instead of eventHub See merge request gitlab-org/gitlab-ce!18703 | |||
2018-05-03 | Use factory in specs for ProjectCiCdSettings | Dylan Griffith | |
2018-05-03 | Emit `toggleSidebar` event on component when icon is clicked | Kushal Pandya | |
2018-05-03 | Consume `toggleSubscription` event directly from Subscriptions component | Kushal Pandya | |
2018-05-03 | Emit `toggleSubscription`, `toggleSidebar` events on component | Kushal Pandya | |
2018-05-03 | Remove Runner#belonging_to_any_project since this is no longer needed | Dylan Griffith | |
2018-05-03 | [Rails5] Fix params passed to MergeWorker | blackst0ne | |
2018-05-03 | Improve Web IDE Commit Panel | André Luís | |
2018-05-03 | Add pass through to stripHtml for undefined and null inputs | Olivier Gonzalez | |
2018-05-03 | Merge branch 'master' into feature/runner-per-group | Dylan Griffith | |
2018-05-03 | Make assertions about runner_type in spec/requests/api/runner_spec.rb | Dylan Griffith | |
2018-05-03 | Style improvements to spec/models/project_spec.rb | Dylan Griffith | |
2018-05-03 | More style improvements to spec/models/ci/runner_spec.rb | Dylan Griffith | |
2018-05-03 | Style changes to spec/models/ci/runner_spec.rb | Dylan Griffith | |
2018-05-03 | Load branches on new merge request page asynchronously | Winnie Hellmann | |
2018-05-02 | Merge branch 'revert-75f6e91f' into 'master' | Phil Hughes | |
Revert "Merge branch '5480-sidebar-subscription-event-handling' into 'master'" Closes #45979 See merge request gitlab-org/gitlab-ce!18692 | |||
2018-05-02 | Merge branch '45761-replace-actionview-time_ago_in_words' into 'master' | Rémy Coutable | |
Deprecation of ActionView's time_ago_in_words Closes #45761 See merge request gitlab-org/gitlab-ce!18607 | |||
2018-05-02 | Merge branch 'jprovazn-generic-error' into 'master' | Nick Thomas | |
Save and expose only generic merge error See merge request gitlab-org/gitlab-ce!18646 | |||
2018-05-02 | Merge branch ↵ | Douwe Maan | |
'45970-broken-master-in-spec-features-issues-user_uses_slash_commands_spec-rb' into 'master' Resolve "Broken master in spec/features/issues/user_uses_slash_commands_spec.rb" Closes #45970 See merge request gitlab-org/gitlab-ce!18687 | |||
2018-05-02 | Revert "Merge branch '5480-sidebar-subscription-event-handling' into 'master'" | Rémy Coutable | |
This reverts merge request !18682 | |||
2018-05-02 | Merge branch 'refactor/move-mr-widget-wip-vue-component' into 'master' | Mike Greiling | |
Move WorkInProgress vue component See merge request gitlab-org/gitlab-ce!17536 | |||
2018-05-02 | Rename Runner#invalidate_build_cache -> Runner#pick_build | Dylan Griffith | |
2018-05-02 | Make sure the user is logged out before they're logged in again | Rémy Coutable | |
Signed-off-by: Rémy Coutable <remy@rymai.me> | |||
2018-05-02 | Consume `toggleSubscription` event directly from Subscriptions component | Kushal Pandya | |
2018-05-02 | Emit `toggleSubscription` event on component instead of eventHub | Kushal Pandya | |
2018-05-02 | Replace the `project/source/markdown_render.feature` spinach test with an ↵ | blackst0ne | |
rspec analog | |||
2018-05-02 | [Rails5] Fix spec/services/applications/create_service_spec.rb | blackst0ne | |
2018-05-02 | Merge branch 'blackst0ne-rails5-fix-notification-setting-spec' into 'master' | Rémy Coutable | |
[Rails5] Fix spec/models/notification_setting_spec.rb See merge request gitlab-org/gitlab-ce!18664 | |||
2018-05-02 | Display and revoke active sessions | Alexis Reigel ( 🌴 may 2nd - may 9th 🌴 ) | |
2018-05-02 | Merge branch 'blackst0ne-rails5-fix-requests-specs' into 'master' | Rémy Coutable | |
[Rails5] Fix `undefined method 'downcase'` errors in requests specs See merge request gitlab-org/gitlab-ce!18645 | |||
2018-05-02 | Merge branch 'make-job-lfs-artifacts-read-only' into 'master' | Douwe Maan | |
Fix file_store for artifacts and lfs when saving See merge request gitlab-org/gitlab-ce!18624 | |||
2018-05-02 | Merge branch 'jr-33320-lfs-settings-interface' into 'master' | Douwe Maan | |
Enable LFS setting UI for Masters and Owners Closes #33320 See merge request gitlab-org/gitlab-ce!18562 | |||
2018-05-02 | Merge branch 'backstage/gb/migrate-pipeline-stages-index' into 'master' | Kamil Trzciński | |
Migrate pipeline stages indices Closes #43009 See merge request gitlab-org/gitlab-ce!18420 | |||
2018-05-02 | Save and expose only generic merge error | Jan Provaznik | |
When an error occurs during merge, the error message is exposed to user and it is also saved in DB. This error message may be user unfriendly (as in !41820) and it could also expose a detailed backend information. Instead of displaying the specific error message, only sanitized generic message is displayed. This is potentially controversial change because disadvantage is that user doesn't get specific reason of failure. Additional changes: * repository.merge including exceptions is is extracted into a separate method to make things clearer * update! is used instead of update so we don't silently ignore an error Related to !41857 | |||
2018-05-01 | Fix file_store for artifacts and lfs when saving | Kamil Trzciński | |
2018-05-01 | Fix memory and performance issues in Karma test suite | Mike Greiling | |
2018-05-01 | Merge branch 'dm-commit-trailer-without-gravatar' into 'master' | Robert Speicher | |
Fix commit trailer rendering when Gravatar is disabled Closes #45633 See merge request gitlab-org/gitlab-ce!18586 | |||
2018-05-01 | Merge branch 'osw-use-cached-highlighted-content-for-discussions' into 'master' | Douwe Maan | |
Use persisted diff data instead fetching Git on discussions Closes #44052 See merge request gitlab-org/gitlab-ce!18657 | |||
2018-05-01 | Enable LFS setting UI for Masters and Owners | James Ramsay | |
LFS can be enabled and disabled per project using the API by Masters and Owners, but the UI is only available to Admins. The interface and API should be consistent. LFS can also be enabled and disabled per group using the API by Owners, but the UI is only available to Admins. This interface should also be consistent. Additionally removes an unneeded check if 2FA interface, since the interface is only available to Owners. Closes #33320 | |||
2018-05-01 | Merge branch 'helm-add-alpine-mirrors' into 'master' | Kamil Trzciński | |
Add alpine mirrors while operating on k8s cluster Closes gitlab-ee#4922 See merge request gitlab-org/gitlab-ce!18651 | |||
2018-05-01 | Merge request and commit discussions API | Jan Provaznik | |
2018-05-01 | Use stages position column to track stage index | Grzegorz Bizon | |
2018-05-01 | Merge branch 'master' into backstage/gb/migrate-pipeline-stages-index | Grzegorz Bizon | |
* master: (106 commits) |