summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rename another filerename-convdev-to-devopsJob van der Voort2018-05-022-41/+41
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into rename-convdev-...Job van der Voort2018-05-021806-14444/+31677
|\
| * Merge branch 'revert-75f6e91f' into 'master'Phil Hughes2018-05-024-11/+11
| |\
| | * Revert "Merge branch '5480-sidebar-subscription-event-handling' into 'master'"Rémy Coutable2018-05-024-11/+11
| * | Merge branch 'zj-namespace-service-mandatory' into 'master'Douwe Maan2018-05-022-40/+9
| |\ \
| | * | Remove old GitLab Shell implementationZeger-Jan van de Weg2018-05-022-40/+9
| * | | Merge branch '45761-replace-actionview-time_ago_in_words' into 'master'Rémy Coutable2018-05-0215-18/+19
| |\ \ \
| | * | | Replace time_ago_in_words with JS-based oneTakuya Noguchi2018-04-2715-18/+19
| * | | | Merge branch 'increase-new-issue-metadata-form-margin' into 'master'Clement Ho2018-05-023-2/+8
| |\ \ \ \
| | * | | | Increase new issue metadata form marginGeorge Tsiolis2018-04-303-2/+8
| * | | | | Merge branch 'jprovazn-generic-error' into 'master'Nick Thomas2018-05-023-12/+27
| |\ \ \ \ \
| | * | | | | Save and expose only generic merge errorJan Provaznik2018-05-023-12/+27
| | |/ / / /
| * | | | | Merge branch '45970-broken-master-in-spec-features-issues-user_uses_slash_com...Douwe Maan2018-05-021-1/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Make sure the user is logged out before they're logged in againRémy Coutable2018-05-021-1/+3
| * | | | | Merge branch 'refactor/move-mr-widget-wip-vue-component' into 'master'Mike Greiling2018-05-025-42/+56
| |\ \ \ \ \
| | * | | | | Move WorkInProgress vue componentGeorge Tsiolis2018-04-165-42/+56
| * | | | | | Merge branch 'refactor/move-sidebar-time-tracking-vue-component' into 'master'Filipa Lacerda2018-05-023-17/+25
| |\ \ \ \ \ \
| | * | | | | | Move SidebarTimeTracking vue componentGeorge Tsiolis2018-05-023-17/+25
| * | | | | | | Merge branch 'refactor/move-no-tracking-pane-vue-component' into 'master'Phil Hughes2018-05-024-12/+20
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Move TimeTrackingNoTrackingPane vue componentGeorge Tsiolis2018-05-024-12/+20
| | |/ / / / /
| * | | | | | Merge branch '5480-sidebar-subscription-event-handling' into 'master'Phil Hughes2018-05-024-11/+11
| |\ \ \ \ \ \
| | * | | | | | Consume `toggleSubscription` event directly from Subscriptions componentKushal Pandya2018-05-022-9/+2
| | * | | | | | Emit `toggleSubscription` event on component instead of eventHubKushal Pandya2018-05-022-2/+9
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'improve-quick-actions-summary-preview' into 'master'Tim Zallmann2018-05-022-0/+15
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Improve quick actions summary previewGeorge Tsiolis2018-05-012-0/+15
| * | | | | | Merge branch 'blackst0ne-replace-spinach-project-source-markdown-render.featu...Rémy Coutable2018-05-026-661/+337
| |\ \ \ \ \ \
| | * | | | | | Replace the `project/source/markdown_render.feature` spinach test with an rsp...blackst0ne2018-05-026-661/+337
| |/ / / / / /
| * | | | | | Merge branch 'blackst0ne-rails5-fix-create-service-spec' into 'master'Rémy Coutable2018-05-021-5/+9
| |\ \ \ \ \ \
| | * | | | | | [Rails5] Fix spec/services/applications/create_service_spec.rbblackst0ne2018-05-021-5/+9
| |/ / / / / /
| * | | | | | Merge branch 'blackst0ne-rails5-fix-notification-setting-spec' into 'master'Rémy Coutable2018-05-021-1/+6
| |\ \ \ \ \ \
| | * | | | | | [Rails5] Fix spec/models/notification_setting_spec.rbblackst0ne2018-05-011-1/+6
| * | | | | | | Merge branch 'blackst0ne-rails5-fix-enum-question-mark-methods' into 'master'Rémy Coutable2018-05-022-0/+18
| |\ \ \ \ \ \ \
| | * | | | | | | [Rails5] Fix enum question mark methodsblackst0ne2018-05-022-0/+18
| |/ / / / / / /
| * | | | | | | Merge branch 'feature/display-active-sessions' into 'master'Douwe Maan2018-05-0223-47/+642
| |\ \ \ \ \ \ \
| | * | | | | | | Display and revoke active sessionsAlexis Reigel ( 🌴 may 2nd - may 9th 🌴 )2018-05-0223-47/+642
| |/ / / / / / /
| * | | | | | | Merge branch 'blackst0ne-rails5-fix-requests-specs' into 'master'Rémy Coutable2018-05-023-7/+7
| |\ \ \ \ \ \ \
| | * | | | | | | [Rails5] Fix `undefined method 'downcase'` errors in requests specsblackst0ne2018-04-293-7/+7
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'blackst0ne-rails5-add-touch-later-to-commit-model' into 'master'Rémy Coutable2018-05-021-0/+6
| |\ \ \ \ \ \ \
| | * | | | | | | [Rails5] Add `touch_later` to `Commit` modelblackst0ne2018-04-291-0/+6
| | |/ / / / / /
| * | | | | | | Merge branch 'blackst0ne-rails5-fix-arel-update-manager' into 'master'Rémy Coutable2018-05-023-5/+27
| |\ \ \ \ \ \ \
| | * | | | | | | [Rails5] Fix Arel::UpdateManagerblackst0ne2018-04-293-5/+27
| | |/ / / / / /
| * | | | | | | Merge branch 'blackst0ne-rails5-fix-tzinfo-invalid-timezone-identifier' into ...Rémy Coutable2018-05-021-1/+7
| |\ \ \ \ \ \ \
| | * | | | | | | [Rails5] Fix TZInfo::InvalidTimezoneIdentifier exceptionblackst0ne2018-04-291-1/+7
| | |/ / / / / /
| * | | | | | | Merge branch 'blackst0ne-rails5-use-safe-params-instead-of-params-in-url-for-...Rémy Coutable2018-05-025-5/+5
| |\ \ \ \ \ \ \
| | * | | | | | | [Rails5] Use `safe_params` instead of `params` in `url_for` helpersblackst0ne2018-04-285-5/+5
| | |/ / / / / /
| * | | | | | | Merge branch 'blackst0ne-rails5-update-application-controller-log-exception' ...Rémy Coutable2018-05-021-1/+2
| |\ \ \ \ \ \ \
| | * | | | | | | [Rails5] Update `ApplicationController#log_exception` to fix `undefined metho...blackst0ne2018-04-281-1/+2
| | |/ / / / / /
| * | | | | | | Merge branch 'make-job-lfs-artifacts-read-only' into 'master'Douwe Maan2018-05-028-22/+20
| |\ \ \ \ \ \ \
| | * | | | | | | Fix file_store for artifacts and lfs when savingKamil Trzciński2018-05-018-22/+20
| * | | | | | | | Merge branch 'blackst0ne-rails5-fix-delete-user-worker' into 'master'Rémy Coutable2018-05-022-8/+5
| |\ \ \ \ \ \ \ \
View Lorry Controller Status