| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add a new RSpec::EnvAssignment cop to prevent assigning to ENV in specs18765-stub_env_in_specs | Rémy Coutable | 2017-10-18 | 4 | -5/+135 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Stub ENV in the LDAP task spec file | Rémy Coutable | 2017-10-18 | 1 | -1/+1 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Stub ENV in the Gitaly task spec file | Rémy Coutable | 2017-10-18 | 1 | -8/+1 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Stub ENV in the backup task spec file | Rémy Coutable | 2017-10-18 | 3 | -188/+109 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Merge branch '39253-jobs-fail-because-of-brazilian-portuguese-translations' ↵ | Rémy Coutable | 2017-10-18 | 1 | -3/+3 |
| |\ | | | | | | | | | | | | | | | | | into 'master' Resolve "Jobs fail because of Brazilian Portuguese translations" Closes #39253 See merge request gitlab-org/gitlab-ce!14939 | ||||
| | * | Prevent ApplicationHelper specs from polluting later ones39253-jobs-fail-because-of-brazilian-portuguese-translations | Sean McGivern | 2017-10-18 | 1 | -3/+3 |
| | | | | | | | | | | | We don't want the locale to be set to Brazilian Portuguese for any subsequent specs! | ||||
| * | | Merge branch 'pms-fix-tooltip-padding' into 'master' | Annabel Dunstone Gray | 2017-10-18 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | Fix tooltip padding to align to 8px grid See merge request gitlab-org/gitlab-ce!14928 | ||||
| | * | | Fix tooltip padding to align to 8px gridpms-fix-tooltip-padding | Pedro Moreira da Silva | 2017-10-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch '39237-fix-ee_compat_check' into 'master' | Sean McGivern | 2017-10-18 | 1 | -1/+3 |
| |\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Improve the gitlab:dev:ee_compat_check task to pass a repo URL without credentials Closes #39237 See merge request gitlab-org/gitlab-ce!14934 | ||||
| | * | | Improve the gitlab:dev:ee_compat_check task to pass a repo URL without ↵39237-fix-ee_compat_check | Rémy Coutable | 2017-10-18 | 1 | -1/+3 |
| |/ / | | | | | | | | | | | credentials Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Merge branch 'bvl-fix-locale-path' into 'master' | Tim Zallmann | 2017-10-18 | 4 | -1/+18 |
| |\ \ | | | | | | | | | | | | | | | | | | | Render region codes for locale assets with an `_` instead of a `-` Closes #39225 See merge request gitlab-org/gitlab-ce!14924 | ||||
| | * | | Build the locale path with an `_` instead of a `-` | Bob Van Landuyt | 2017-10-18 | 4 | -1/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The locale code is turned into an asset path with an underscore instead of a dash. The language codes are transformed by `I18n.locale` into a code with a dash. But the resources for translating are always stored in a path using a `_` separating the language and the region code. | ||||
| * | | | Merge branch 'add-lazy-option-to-user-avatar-image-component' into 'master' | Tim Zallmann | 2017-10-18 | 3 | -28/+78 |
| |\ \ \ | | | | | | | | | | | | | | | | | Add lazy option to UserAvatarImage See merge request gitlab-org/gitlab-ce!14895 | ||||
| | * | | | Add lazy option to UserAvatarImageadd-lazy-option-to-user-avatar-image-component | Eric Eastwood | 2017-10-17 | 3 | -28/+78 |
| | | | | | |||||
| * | | | | Merge branch 'fix-resolved-side-by-side' into 'master' | Phil Hughes | 2017-10-18 | 3 | -7/+31 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix resolved discussions not expanding on side by side view Closes #39209 See merge request gitlab-org/gitlab-ce!14918 | ||||
| | * | | | | Fix resolved discussions not expanding on side by side view | Clement Ho | 2017-10-18 | 3 | -7/+31 |
| |/ / / / | |||||
| * | | | | Merge branch '38986-due-date' into 'master' | Phil Hughes | 2017-10-18 | 13 | -50/+115 |
| |\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | Fix Pikaday Closes #38986 See merge request gitlab-org/gitlab-ce!14881 | ||||
| | * | | | Fix Pikaday | Filipa Lacerda | 2017-10-18 | 13 | -50/+115 |
| |/ / / | |||||
| * | | | Merge branch 'feature/migrate-wiki-write-page-to-gitaly' into 'master' | Sean McGivern | 2017-10-18 | 6 | -36/+110 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Wiki#write_page to Gitaly Closes gitaly#638 See merge request gitlab-org/gitlab-ce!14870 | ||||
| | * | | | Migrate Gitlab::Git::Wiki#write_page to Gitalyfeature/migrate-wiki-write-page-to-gitaly | Ahmad Sherif | 2017-10-16 | 6 | -36/+110 |
| | | | | | | | | | | | | | | | | | Closes gitaly#638 | ||||
| * | | | | Merge branch '39201-improve-google-image' into 'master'35616-gke-1st-iteration | Phil Hughes | 2017-10-18 | 2 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace google login image Closes #39201 See merge request gitlab-org/gitlab-ce!14919 | ||||
| | * | | | | Replace google login image39201-improve-google-image | Filipa Lacerda | 2017-10-17 | 2 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'sh-security-fix-backports-master' into 'master' | Robert Speicher | 2017-10-18 | 14 | -80/+149 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Backport all fixes from GitLab 10.1 into master See merge request gitlab-org/gitlab-ce!14922 | ||||
| | * | | | | | Remove already released CHANGELOG filessh-security-fix-backports-master | Stan Hu | 2017-10-17 | 3 | -15/+0 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into sh-security-fix-backports-master | Stan Hu | 2017-10-17 | 234 | -2291/+6407 |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | | Merge branch 'security-10-1' into '10-1-stable' | Jen-Shin Lin | 2017-10-17 | 16 | -80/+141 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Security fixes for 10.1 RC See merge request gitlab/gitlabhq!2209 | ||||
| | * | | | | | Update CHANGELOG.md for 10.0.4 | Jarka Kadlecova | 2017-10-16 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | | | Update CHANGELOG.md for 9.5.9 | Jarka Kadlecova | 2017-10-16 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | | | Update CHANGELOG.md for 9.4.7 | Jarka Kadlecova | 2017-10-16 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | | Merge branch '30140-restore-readme-only-preference' into 'master' | Douwe Maan | 2017-10-18 | 6 | -14/+41 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add readme only option as project view Closes #30140 See merge request gitlab-org/gitlab-ce!14900 | ||||
| | * | | | | | | Small code style changes | Douwe Maan | 2017-10-18 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Add readme title and check for rich_viewer30140-restore-readme-only-preference | Annabel Dunstone Gray | 2017-10-17 | 1 | -1/+6 |
| | | | | | | | | |||||
| | * | | | | | | Fix spec | Annabel Dunstone Gray | 2017-10-16 | 1 | -1/+0 |
| | | | | | | | | |||||
| | * | | | | | | Add readme only option as project view | Annabel Dunstone Gray | 2017-10-16 | 6 | -14/+37 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch '37032-get-project-branch-invalid-name-message' into 'master' | Rémy Coutable | 2017-10-18 | 4 | -8/+62 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get Project Branch API shows an helpful error message on invalid refname Closes #37032 See merge request gitlab-org/gitlab-ce!14884 | ||||
| | * | | | | | | | Get Project Branch API shows an helpful error message on invalid refname | Jacopo | 2017-10-18 | 4 | -8/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In API v4 when requesting a branch with an invalid refname shows an helpful error message: 'The branch refname is invalid'. | ||||
| * | | | | | | | | Merge branch 'tc-saml-fix-false-empty' into 'master' | Douwe Maan | 2017-10-18 | 6 | -22/+74 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SAML fix when auth hash attributes do not define groups Closes #38923 See merge request gitlab-org/gitlab-ce!14913 | ||||
| | * | | | | | | | | Fix SAML error 500 when no groups are defined for usertc-saml-fix-false-empty | Toon Claes | 2017-10-18 | 6 | -22/+74 |
| | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there are no groups defined in the auth hash attributes, `Gitlab::Saml::AuthHash#groups` should return an empty array, and `Gitlab::Saml::User#find_user` should not mark the user as external. Closes gitlab-org/gitlab-ce#38923. | ||||
| * | | | | | | | | Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' into 'master' | Grzegorz Bizon | 2017-10-18 | 6 | -7/+17 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add short_revision and use total_size Closes #39203 See merge request gitlab-org/gitlab-ce!14917 | ||||
| | * | | | | | | | | Fix broken testkt/bug/fix-revision-and-size-for-container-registry | Filipa Lacerda | 2017-10-17 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fix failed test | Kamil Trzcinski | 2017-10-17 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add short_revision and use total_size | Kamil Trzcinski | 2017-10-17 | 6 | -5/+15 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'improve-database-yml-examples' into 'master' | Rémy Coutable | 2017-10-18 | 3 | -18/+30 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Improve database yml examples See merge request gitlab-org/gitlab-ce!10247 | ||||
| | * | | | | | | | | Update scripts/prepare_build.sh | bogdanvlviv | 2017-10-17 | 1 | -4/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Update database.yml.postgresql | bogdanvlviv | 2017-10-17 | 1 | -11/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | host is omitted by default | ||||
| | * | | | | | | | | Set 'staging specific' in database.yml.mysql | bogdanvlviv | 2017-10-17 | 1 | -3/+18 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'ph-multi-file-editor-restructure-data' into 'master' | Filipa Lacerda | 2017-10-17 | 33 | -735/+522 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored multi-file data structure See merge request gitlab-org/gitlab-ce!14862 | ||||
| | * | | | | | | | | fixed Karam test because of event name changeph-multi-file-editor-restructure-data | Phil Hughes | 2017-10-17 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixed bug when clicking file link causing user to navigate away | Phil Hughes | 2017-10-17 | 13 | -35/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a test for flattenedFiles Changes the data method to not be an arrow method Various other review fixes | ||||
| | * | | | | | | | | fixed prev directory row not correctly having colspan | Phil Hughes | 2017-10-16 | 3 | -9/+9 |
| | | | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |