| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | Merge remote-tracking branch 'dev/master' | DJ Mountney | 2017-03-20 | 1 | -0/+31 | |
| |\ \ \ \ | ||||||
| | * | | | | Merge branch 'ssrf' into 'security' | Douwe Maan | 2017-03-20 | 1 | -0/+31 | |
| | | |/ / | |/| | | | | | | | | | | | | | | Protect server against SSRF in project import URLs See merge request !2068 | |||||
| * | | | | Merge branch 'issue_27212' into 'master' | Sean McGivern | 2017-03-20 | 1 | -0/+1 | |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Add closed_at field to issues Closes #27212 See merge request !9977 | |||||
| | * | | | Add closed_at field to issues | Felipe Artur | 2017-03-17 | 1 | -0/+1 | |
| | |/ / | ||||||
| * | | | All CI offline migrations | Kamil Trzciński | 2017-03-17 | 4 | -49/+26 | |
| |/ / | ||||||
| * | | Merge branch 'database-config-method' into 'master' | Rémy Coutable | 2017-03-17 | 1 | -4/+10 | |
| |\ \ | | | | | | | | | | | | | Added Gitlab::Database.config See merge request !10045 | |||||
| | * | | Added Gitlab::Database.config | Yorick Peterse | 2017-03-17 | 1 | -4/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This returns the ActiveRecord configuration for the current environment. While CE doesn't use this very often, EE will use it in a few places for the database load balancing code. I'm adding this to CE so we don't end up with merge conflicts in this file. | |||||
| * | | | Merge branch 'feature/use-gitaly-for-commit-show' into 'master' | Robert Speicher | 2017-03-17 | 2 | -0/+95 | |
| |\ \ \ | |/ / |/| | | | | | | | | Use Gitaly for CommitController#show See merge request !9629 | |||||
| | * | | Use Gitaly for CommitController#showfeature/use-gitaly-for-commit-show | Ahmad Sherif | 2017-03-15 | 2 | -0/+95 | |
| | | | | ||||||
| * | | | Merge branch ↵ | Sean McGivern | 2017-03-17 | 1 | -0/+5 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '26470-branch-names-with-reference-prefixes-results-in-buggy-branches' into 'master' Strip reference prefixes on branch creation Closes #26470 See merge request !8498 | |||||
| | * | | | Strip reference prefixes on branch creation | Matthieu Tardy | 2017-01-09 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Matthieu Tardy <matthieu.tardy@gmail.com> | |||||
| * | | | | Merge branch ↵ | Rémy Coutable | 2017-03-16 | 1 | -0/+6 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '29565-name-of-the-uncompressed-folder-of-a-tag-archive-changed' into 'master' Fix archive prefix bug for refs containing dots Closes #29565 See merge request !10007 | |||||
| | * | | | | Fix archive prefix bug for refs containing dots | Mark Fletcher | 2017-03-16 | 1 | -0/+6 | |
| | | | | | | ||||||
| * | | | | | Futher rename the CI variableszj-rename-ci-vars | Z.J. van de Weg | 2017-03-16 | 2 | -4/+4 | |
| |/ / / / | ||||||
| * | | | | Merge branch 'dm-fix-mailroom-config' into 'master' | DJ Mountney | 2017-03-16 | 1 | -31/+28 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix reply by email by fixing config/mail_room.yml to be interpretable without ActiveSupport See merge request !9979 | |||||
| | * | | | | Fix redis spec | Douwe Maan | 2017-03-15 | 1 | -31/+28 | |
| | | |/ / | |/| | | ||||||
| * | | | | Merge branch 'dm-copy-code-as-gfm' into 'master' | Sean McGivern | 2017-03-15 | 3 | -10/+10 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Copy code as GFM from diffs, blobs and GFM code blocks See merge request !9874 | |||||
| | * | | | | Fix specs | Douwe Maan | 2017-03-14 | 3 | -10/+10 | |
| | |/ / / | ||||||
| * | | | | Merge branch 'allow-resolving-conflicts-in-utf-8' into 'master' | Robert Speicher | 2017-03-15 | 1 | -30/+59 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow resolving conflicts with non-ASCII chars Closes #26214 See merge request !9937 | |||||
| | * | | | | Allow resolving conflicts with non-ASCII charsallow-resolving-conflicts-in-utf-8 | Sean McGivern | 2017-03-15 | 1 | -30/+59 | |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We wanted to check that the text could be encoded as JSON, because conflict resolutions are passed back and forth in that format, so the file itself must be UTF-8. However, all strings from the repository come back without an encoding from Rugged, making them ASCII_8BIT. We force to UTF-8, and reject if it's invalid. This still leaves the problem of a file that 'looks like' UTF-8 (contains valid UTF-8 byte sequences), but isn't. However: 1. If the conflicts contain the problem bytes, the user will see that the file isn't displayed correctly. 2. If the problem bytes are outside of the conflict area, then we will write back the same bytes when we resolve the conflicts, even though we though the encoding was UTF-8. | |||||
| * | | | | Allow to override GITLAB_GIT_TEST_REPO_URL to specify a different ↵27551-use-dev-mirror-of-gitlab-git-test-on-dev | Rémy Coutable | 2017-03-14 | 1 | -1/+1 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | gitlab-git-test repo We will set this to the dev mirror in GitLab CE and EE on dev. Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
| * | | | Merge branch 'nonewline-parser' into 'master' | Sean McGivern | 2017-03-14 | 1 | -0/+48 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Take nonewline context into account in diff parser Closes #28128 and #22636 See merge request !9705 | |||||
| | * | | | take nonewline context into account in diff parser | mhasbini | 2017-03-13 | 1 | -0/+48 | |
| | | | | | ||||||
| * | | | | Backport changes from gitlab-org/gitlab-ee!1406adam-backport-ee-1406 | Adam Niedzielski | 2017-03-13 | 1 | -2/+10 | |
| |/ / / | ||||||
| * | | | Using guard clause and added more specs29046-fix-github-importer-open-prs | Gabriel Mazetto | 2017-03-10 | 2 | -49/+87 | |
| | | | | ||||||
| * | | | Fix GitHub Import for open PRs from a fork | Gabriel Mazetto | 2017-03-10 | 1 | -0/+24 | |
| | | | | ||||||
| * | | | Fix for creating a project through API when import_url is niltc-fix-project-create-500 | Toon Claes | 2017-03-10 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | The API was returning 500 when `nil` is passed for the `import_url`. In fact, it was `Gitlab::UrlSanitizer.valid?` which was throwing a `NoMethodError` when `nil` value was passed. | |||||
| * | | | Merge branch 'feature/gb/verbosify-blocked-pipeline-status' into 'master' | Kamil Trzciński | 2017-03-09 | 2 | -2/+66 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Verbosify blocked pipeline status description Closes #29134 See merge request !9800 | |||||
| | * | | | Add specs for an extended blocked pipeline statusfeature/gb/verbosify-blocked-pipeline-status | Grzegorz Bizon | 2017-03-08 | 1 | -0/+42 | |
| | | | | | ||||||
| | * | | | Adjust specs for core pipeline detailed statuses | Grzegorz Bizon | 2017-03-08 | 1 | -2/+24 | |
| | | | | | ||||||
| * | | | | Refactor some code29034-fix-github-importer | Gabriel Mazetto | 2017-03-08 | 1 | -0/+18 | |
| | | | | | ||||||
| * | | | | Fix name colision when importing GitHub pull requests from forked repositories | Gabriel Mazetto | 2017-03-08 | 1 | -0/+10 | |
| | | | | | ||||||
| * | | | | Merge branch 'fix/29093' into 'master' | Sean McGivern | 2017-03-08 | 3 | -13/+13 | |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Fix 'Object not found - no match for id (sha)' when importing GitHub PRs Closes #29093 See merge request !9751 | |||||
| | * | | | Fix 'Object not found - no match for id (sha)' when importing GitHub PRs | Douglas Barbosa Alexandre | 2017-03-07 | 3 | -13/+13 | |
| | | | | | ||||||
| * | | | | Merge branch 'dm-nested-groups-go-get' into 'master' | Douwe Maan | 2017-03-08 | 1 | -9/+86 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix go-get support for projects in nested groups See merge request !9793 | |||||
| | * | | | | Fix go-get support for projects in nested groupsdm-nested-groups-go-get | Douwe Maan | 2017-03-07 | 1 | -9/+86 | |
| | | | | | | ||||||
| * | | | | | Returns correct header data for commits endpoint | Oswaldo Ferreira | 2017-03-07 | 1 | -9/+6 | |
| | | | | | | ||||||
| * | | | | | Fix pagination headers for repository commits api endpoint | George Andrinopoulos | 2017-03-07 | 1 | -0/+29 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' into orderable-issues | Douwe Maan | 2017-03-07 | 5 | -11/+303 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | Added Prometheus Service and Prometheus graphs | Kamil Trzciński | 2017-03-07 | 2 | -0/+144 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'siemens/gitlab-ce-feature/openid-connect' | Sean McGivern | 2017-03-07 | 1 | -0/+30 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Only use API scopes for personal access tokens | Markus Koller | 2017-03-07 | 1 | -0/+18 | |
| | | | | | | | ||||||
| | | * | | | | Don't allow blocked users to authenticate through other means | Markus Koller | 2017-03-07 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Auth.find_with_user_password is currently used in these places: - resource_owner_from_credentials in config/initializers/doorkeeper.rb, which is used for the OAuth Resource Owner Password Credentials flow - the /session API call in lib/api/session.rb, which is used to reveal the user's current authentication_token In both cases users should only be authenticated if they're in the active state. | |||||
| | * | | | | | Merge remote-tracking branch ↵ | Douwe Maan | 2017-03-07 | 1 | -11/+23 | |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | 'origin/personal_access_token_api_and_impersonation_token' | |||||
| | | * | | | | apply codestyle and implementation changes to the respective feature codepersonal_access_token_api_and_impersonation_token | Tiago Botelho | 2017-03-06 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | | * | | | | refactors finder and correlated code | Tiago Botelho | 2017-03-01 | 1 | -2/+9 | |
| | | | | | | | ||||||
| | | * | | | | add impersonation token | Simon Vocella | 2017-02-28 | 1 | -12/+17 | |
| | | | | | | | ||||||
| | * | | | | | Merge branch 'feature/runner-jobs-v4-api' into 'master' | Kamil Trzciński | 2017-03-07 | 2 | -0/+106 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature/runner jobs v4 api Closes #28513 See merge request !9273 | |||||
| | | * | | | | | Add minor refactoringfeature/runner-jobs-v4-api | Tomasz Maczukin | 2017-03-07 | 2 | -22/+43 | |
| | | | | | | | | ||||||
| | | * | | | | | Fix rubocop offenses | Tomasz Maczukin | 2017-03-06 | 2 | -2/+2 | |
| | | | | | | | | ||||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |