summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Refactors SAML identity creation in gl_user.33493-attempt-to-link-saml-users-to-ldap-by-emailTiago Botelho2017-10-018-160/+122
* Creates compound query for LDAP email attributes.Tiago Botelho2017-09-252-7/+15
* Attempt to link saml users to ldap by emailTiago Botelho2017-09-255-8/+101
* Merge branch '38280-undefined-run_command-when-running-rake-gitlab-check' int...Douwe Maan2017-09-255-2/+44
|\
| * Fixed few gitlab:check tasks that were failing with exception38280-undefined-run_command-when-running-rake-gitlab-checkGabriel Mazetto2017-09-255-2/+44
* | Merge branch '38021-add-instructions-for-upgrading-from-ce-to-ee-using-gitlab...Achilleas Pipinellis2017-09-251-0/+16
|\ \
| * | Add instructions for upgrading from CE to EE using GitLab Omnibus chart - docsJoshua Lambert2017-09-251-0/+16
|/ /
* | Merge branch 'rs-allow-name-on-anchors' into 'master'Douwe Maan2017-09-253-3/+13
|\ \
| * | Make the "customizes the whitelist only once" spec less brittlers-allow-name-on-anchorsRobert Speicher2017-09-221-1/+3
| * | Re-allow `name` attribute on user-provided anchor HTMLRobert Speicher2017-09-223-2/+10
* | | Merge branch 'rc/refactor-project_policy_spec-ce' into 'master'Douwe Maan2017-09-251-47/+86
|\ \ \
| * | | Refactor spec/policies/project_policy_spec.rb to minimize the diff with EErc/refactor-project_policy_spec-ceRémy Coutable2017-09-221-47/+86
* | | | Merge branch '37287-remove-nav-gradient' into 'master'Phil Hughes2017-09-251-2/+2
|\ \ \ \
| * | | | Remove navbar gradient37287-remove-nav-gradientAnnabel Dunstone Gray2017-09-221-2/+2
* | | | | Merge branch 'sh-remove-additional-grit-settings' into 'master'Rémy Coutable2017-09-251-3/+1
|\ \ \ \ \
| * | | | | Remove Grit settings from default settingssh-remove-additional-grit-settingsStan Hu2017-09-231-3/+1
* | | | | | Merge branch 'master' into 'master'Rémy Coutable2017-09-251-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | fix minor spelling mistakesRené Genz2017-09-201-2/+2
* | | | | | Update CHANGELOG.md for 10.0.1Stan Hu2017-09-232-5/+4
| |/ / / / |/| | | |
* | | | | Merge branch 'sh-fix-issue-38246' into 'master'Yorick Peterse2017-09-233-2/+7
|\ \ \ \ \
| * | | | | Fix duplicate key errors in PostDeployMigrateUserExternalMailData migrationsh-fix-issue-38246Stan Hu2017-09-223-2/+7
|/ / / / /
* | | | | Merge branch '38171-workaround' into 'master'Robert Speicher2017-09-221-1/+4
|\ \ \ \ \
| * | | | | Workaround for n+1 in Projects::TreeController#show38171-workaroundAndrew Newdigate2017-09-221-1/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch '36549-circuit-breaker-handles-missing-storages' into 'master'Douwe Maan2017-09-2210-22/+175
|\ \ \ \ \
| * | | | | Allow the git circuit breaker to correctly handle missing repository storagesNick Thomas2017-09-2210-22/+175
* | | | | | Merge branch 'docs-update-ux-guide' into 'master'Marcia Ramos2017-09-221-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | fix typo in icons sectiondocs-update-ux-guideSarrah Vesselov2017-09-221-1/+1
* | | | | | Merge branch 'post_receive_n_plus_1_workaround' into 'master'Robert Speicher2017-09-221-2/+5
|\ \ \ \ \ \
| * | | | | | Workaround for #38259Andrew Newdigate2017-09-221-2/+5
|/ / / / / /
* | | | | | Merge branch 'dm-group-share-lock-default-help' into 'master'Rémy Coutable2017-09-221-1/+1
|\ \ \ \ \ \
| * | | | | | Inform user that current shared projects will remain shareddm-group-share-lock-default-helpDouwe Maan2017-09-221-1/+1
* | | | | | | Merge branch 'remove-redundant-icons' into 'master'Annabel Dunstone Gray2017-09-226-29/+3
|\ \ \ \ \ \ \
| * | | | | | | Removed old icons from project pagePhil Hughes2017-09-226-29/+3
|/ / / / / / /
* | | | | | | Merge branch 'ee-to-ce-2017-09-22' into 'master'Rémy Coutable2017-09-221-7/+8
|\ \ \ \ \ \ \
| * | | | | | | Don't show it if there's no project.ee-to-ce-2017-09-22Lin Jen-Shin2017-09-221-7/+8
* | | | | | | | Merge branch 'winh-i18-branches-page' into 'master'Phil Hughes2017-09-224-66/+79
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Make branches page translatableWinnie Hellmann2017-09-224-66/+79
|/ / / / / / /
* | | | | | | Merge branch 'jej/demonstrate-details-summary' into 'master'Achilleas Pipinellis2017-09-221-0/+24
|\ \ \ \ \ \ \
| * | | | | | | Demonstrate <details> and <summary> tags in doc/user/markdown.mdjej/demonstrate-details-summaryJames Edwards-Jones2017-09-151-0/+24
* | | | | | | | Merge branch 'feature/migrate-repository-diff' into 'master'Douwe Maan2017-09-225-16/+61
|\ \ \ \ \ \ \ \
| * | | | | | | | Migrate Gitlab::Git::Repository#diff to Gitalyfeature/migrate-repository-diffAhmad Sherif2017-09-215-16/+61
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'ee-add-project-repository-storages-index' into 'master'Douwe Maan2017-09-223-1/+26
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Index projects on repository storageNick Thomas2017-09-213-1/+26
* | | | | | | | Merge branch 'replace_project_shortcuts.feature' into 'master'Rémy Coutable2017-09-226-126/+119
|\ \ \ \ \ \ \ \
| * | | | | | | | Replace the 'project/shortcuts.feature' spinach test with an rspec analogreplace_project_shortcuts.featureVitaliy @blackst0ne Klachkov2017-09-226-126/+119
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-cev10.1.0.preJarka Kadlecova2017-09-227-27/+116
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '38197-fix-ImapAuthenticationCheck' into 'master'Douwe Maan2017-09-222-17/+33
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix rake gitlab:incoming_email:check and make it38197-fix-ImapAuthenticationCheckLin Jen-Shin2017-09-222-17/+33
| * | | | | | | | | | Merge branch '38234-reserve-refs-replace' into 'master'Rémy Coutable2017-09-222-0/+6
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Reserve refs/replace cos `git-replace` is using it38234-reserve-refs-replaceLin Jen-Shin2017-09-222-0/+6
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
View Lorry Controller Status