summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Change the docs license to CC BY-SAdocs-licenseAchilleas Pipinellis2018-05-032-1/+11
* Merge branch '45970-additional-signout-needed' into 'master'Douwe Maan2018-05-031-0/+2
|\
| * ensure users are signed out properly in user_uses_slash_commands_spec.rbLukas Eipert2018-05-031-0/+2
|/
* Merge branch '5480-sidebar-subscription-event-handling' into 'master'Phil Hughes2018-05-036-10/+60
|\
| * Emit `toggleSidebar` event on component when icon is clickedKushal Pandya2018-05-032-0/+18
| * Consume `toggleSubscription` event directly from Subscriptions componentKushal Pandya2018-05-032-9/+2
| * Emit `toggleSubscription`, `toggleSidebar` events on componentKushal Pandya2018-05-032-1/+40
* | Merge branch 'update-devise' into 'master'Douwe Maan2018-05-032-10/+11
|\ \
| * | update devise 4.2 -> 4.4Pirate Praveen2018-05-032-10/+11
* | | Merge branch 'blackst0ne-rails5-fix-trusted-proxies' into 'master'Rémy Coutable2018-05-031-0/+13
|\ \ \ | |/ / |/| |
| * | [Rails5] Fix trusted proxiesblackst0ne2018-05-031-0/+13
* | | Merge branch 'blackst0ne-remove-spinach-group-active-tab-feature' into 'master'Rémy Coutable2018-05-032-8/+0
|\ \ \ | |/ / |/| |
| * | CE port of "Remove `features/group_active_tab.feature`"blackst0ne2018-05-032-8/+0
|/ /
* | Merge branch 'update-environment-item-action-buttons-icons' into 'master'Filipa Lacerda2018-05-036-34/+39
|\ \
| * | Update environment item action buttons iconsGeorge Tsiolis2018-05-036-34/+39
* | | Merge branch 'blackst0ne-rails-fix-params-passed-to-merge-worker' into 'master'Rémy Coutable2018-05-033-8/+6
|\ \ \
| * | | [Rails5] Fix params passed to MergeWorkerblackst0ne2018-05-033-8/+6
|/ / /
* | | Merge branch 'ide-improve-commit-panel' into 'master'Phil Hughes2018-05-0315-61/+169
|\ \ \
| * | | Improve Web IDE Commit PanelAndré Luís2018-05-0315-61/+169
|/ / /
* | | Merge branch 'add_pass_through_to_strip_html_utility' into 'master'Phil Hughes2018-05-032-1/+13
|\ \ \
| * | | Add pass through to stripHtml for undefined and null inputsOlivier Gonzalez2018-05-032-1/+13
|/ / /
* | | Merge branch 'ce-jej/identity-relates-to-saml' into 'master'Douwe Maan2018-05-031-2/+6
|\ \ \
| * | | Backport Identity.uniqueness_scope from EEJames Edwards-Jones2018-05-021-2/+6
* | | | Merge branch 'zj-fork-opt-out' into 'master'Douwe Maan2018-05-032-1/+7
|\ \ \ \
| * | | | Forking repositories is handled by Gitaly by defaultZeger-Jan van de Weg2018-05-022-1/+7
* | | | | Merge branch 'change-font-for-tables-inside-diff-discussions' into 'master'Filipa Lacerda2018-05-032-0/+11
|\ \ \ \ \
| * | | | | Change font for tables inside diff discussionsGeorge Tsiolis2018-05-012-0/+11
* | | | | | Merge branch 'docs-use-variables-deploy-policy-for-staging-and-production' in...Achilleas Pipinellis2018-05-032-0/+23
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Include documentation about STAGING_ENABLED variable for AutoDevopsMayra Cabrera2018-05-032-0/+23
|/ / / / /
* | | | | Merge branch 'winh-new-mergerequest-branch-picker' into 'master'Clement Ho2018-05-0215-189/+158
|\ \ \ \ \
| * | | | | Load branches on new merge request page asynchronouslyWinnie Hellmann2018-05-0215-189/+158
|/ / / / /
* | | | | Update CHANGELOG.md for 10.7.3Mayra Cabrera2018-05-029-40/+14
* | | | | Merge branch 'zj-repo-checksum-opt-out' into 'master'Robert Speicher2018-05-022-1/+7
|\ \ \ \ \
| * | | | | Compute repository checksum by defaultZeger-Jan van de Weg2018-04-302-1/+7
* | | | | | Merge branch 'tz-optimize-emoji-sprite' into 'master'Clement Ho2018-05-029-2697/+5501
|\ \ \ \ \ \
| * | | | | | Optimize Emoji Sprite HandlingTim Zallmann2018-05-029-2697/+5501
|/ / / / / /
* | | | | | 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
View Lorry Controller Status