summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added button to download 2FA codesadd-2fa-buttonDimitrie Hoekstra2018-06-252-0/+18
* Merge branch 'feature/honor-saml-assurance-level' into 'master'Douwe Maan2018-06-2514-93/+435
|\
| * Honor saml assurance level to allow 2FA bypassingRoger Rüttimann2018-06-2514-93/+435
|/
* Merge branch 'zj-create-from-bundle-mandatory' into 'master'Douwe Maan2018-06-254-41/+22
|\
| * Moves another RPC to mandatoryZeger-Jan van de Weg2018-06-254-41/+22
* | Merge branch 'unify-admin-controllers' into 'master'Douwe Maan2018-06-252-4/+4
|\ \
| * | Bring changes from EELin Jen-Shin2018-06-252-4/+4
| |/
* | Merge branch 'zj-is-anchestor' into 'master'Douwe Maan2018-06-253-369/+30
|\ \
| * | Update remote happens through Gitaly onlyZeger-Jan van de Weg2018-06-252-353/+29
| * | Anchestor check is Gitaly only nowZeger-Jan van de Weg2018-06-251-16/+1
* | | Merge branch 'zj-write-config' into 'master'Douwe Maan2018-06-252-40/+24
|\ \ \
| * | | Write Config is mandatoryZeger-Jan van de Weg2018-06-252-40/+24
| | |/ | |/|
* | | Merge branch 'unify-delete_user_worker_spec.rb' into 'master'Douwe Maan2018-06-251-4/+6
|\ \ \
| * | | Prefer `expect_next_instance_of` over `expect_any_instance_of`unify-delete_user_worker_spec.rbLin Jen-Shin2018-06-251-4/+6
| |/ /
* | | Merge branch 'zj-missing-part-linguist' into 'master'Douwe Maan2018-06-251-23/+2
|\ \ \
| * | | Remove feature gatezj-missing-part-linguistZeger-Jan van de Weg2018-06-251-23/+2
| | |/ | |/|
* | | Merge branch 'zj-tree-entry-mandatory' into 'master'Douwe Maan2018-06-252-98/+27
|\ \ \
| * | | Gitaly tree entry is mandatoryzj-tree-entry-mandatoryZeger-Jan van de Weg2018-06-252-98/+27
* | | | Merge branch '6598-notify-only-open-unmergeable-mr' into 'master'Sean McGivern2018-06-255-27/+52
|\ \ \ \
| * | | | Notify conflict only for opened/locked merge requestsMark Chao2018-06-255-27/+52
|/ / / /
* | | | Merge branch 'kp-make-gfm-autocomplete-configurable' into 'master'Phil Hughes2018-06-2513-37/+63
|\ \ \ \
| * | | | Update GFM autocomplete configkp-make-gfm-autocomplete-configurableKushal Pandya2018-06-257-7/+22
| * | | | Update map name for default autocomplete configKushal Pandya2018-06-251-2/+2
| * | | | Add default autocomplete configKushal Pandya2018-06-255-28/+39
| | |/ / | |/| |
* | | | Merge branch 'docs/document-new-preview' into 'master'Rémy Coutable2018-06-252-21/+20
|\ \ \ \
| * | | | Document how the new automatic review apps for docs workAchilleas Pipinellis2018-06-252-21/+20
* | | | | Merge branch '6165_project_security_dashboard-CE' into 'master'Filipa Lacerda2018-06-254-7/+15
|\ \ \ \ \
| * | | | | Update project sidebar to work with EE feature Security DashboardOlivier Gonzalez2018-06-254-7/+15
|/ / / / /
* | | | | Merge branch '46571-webhooks-nil-password' into 'master'Rémy Coutable2018-06-253-1/+36
|\ \ \ \ \
| * | | | | Resolve "WebHookService doesn't handle user info with nil passwords"Jan Beckmann2018-06-253-1/+36
|/ / / / /
* | | | | Merge branch 'ide-tab-active-click-fix' into 'master'Filipa Lacerda2018-06-252-3/+25
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed the IDE commit list item loosing its active stateide-tab-active-click-fixPhil Hughes2018-06-252-3/+25
| | |/ / | |/| |
* | | | Merge branch 'docs/always-on-review-apps-for-docs' into 'master'Rémy Coutable2018-06-252-19/+32
|\ \ \ \
| * | | | Always run review app for docs-only branchesAchilleas Pipinellis2018-06-252-19/+32
| | |/ / | |/| |
* | | | Merge branch 'enforce-variable-value-to-be-a-string' into 'master'Grzegorz Bizon2018-06-257-19/+81
|\ \ \ \
| * | | | Add CHANGELOG entryTomasz Maczukin2018-06-251-0/+5
| * | | | Enforce setting string as value of the CI/CD variableTomasz Maczukin2018-06-256-19/+76
* | | | | Merge branch 'jprovazn-rails5-mysql-datetime' into 'master'Yorick Peterse2018-06-254-8/+31
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Mysql fixes for Rails 5jprovazn-rails5-mysql-datetimeJan Provaznik2018-06-214-8/+31
* | | | | Merge branch 'unify-test_bundle.js' into 'master'Phil Hughes2018-06-251-1/+0
|\ \ \ \ \
| * | | | | Bring changes from EELin Jen-Shin2018-06-251-1/+0
| | |_|_|/ | |/| | |
* | | | | Merge branch 'osw-delete-non-latest-mr-diff-files-upon-merge' into 'master'Sean McGivern2018-06-2518-88/+346
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Delete non-latest merge request diff files upon diffs reloadosw-delete-non-latest-mr-diff-files-upon-mergeOswaldo Ferreira2018-06-2418-88/+346
| | |_|/ | |/| |
* | | | Merge branch '46396-recognise-when-a-user-is-trying-to-validate-a-private-ssh...Phil Hughes2018-06-253-6/+14
|\ \ \ \
| * | | | (Part 1) Resolve "Recognise when a user is trying to validate a private SSH key"Luke Bennett2018-06-253-6/+14
|/ / / /
* | | | Merge branch 'rails5-enum-pipeline-check' into 'master'Sean McGivern2018-06-251-0/+4
|\ \ \ \
| * | | | Fix auto_cancel_pending_pipelines checkJan Provaznik2018-06-251-0/+4
|/ / / /
* | | | Merge branch 'unify-filtered_search_token_keys_spec.js' into 'master'Phil Hughes2018-06-251-0/+11
|\ \ \ \
| * | | | Bring changes from EEunify-filtered_search_token_keys_spec.jsLin Jen-Shin2018-06-221-0/+11
* | | | | Merge branch '40005-u2f-unspported-browsers' into 'master'Phil Hughes2018-06-254-40/+60
|\ \ \ \ \
View Lorry Controller Status