| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'refactor/global-permissions-for-internal-users' into 'master' | Sean McGivern | 2017-03-13 | 5 | -13/+13 |
| |\ | | | | | | | | | Refactor/global permissions for internal users See merge request !9598 | ||||
| | * | reverse the logic and use a clearer name | http://jneen.net/ | 2017-03-09 | 1 | -7/+7 |
| | | | |||||
| | * | protect git access through the policy infra | http://jneen.net/ | 2017-03-09 | 1 | -1/+1 |
| | | | |||||
| | * | use the policy stack to protect logins | http://jneen.net/ | 2017-03-09 | 1 | -1/+1 |
| | | | |||||
| | * | use a magic default :global symbol instead of nil | http://jneen.net/ | 2017-03-09 | 4 | -5/+5 |
| | | | | | | | | | to make sure we mean the global permissions | ||||
| * | | Using guard clause and added more specs29046-fix-github-importer-open-prs | Gabriel Mazetto | 2017-03-10 | 2 | -9/+3 |
| | | | |||||
| * | | Fix GitHub Import for open PRs from a fork | Gabriel Mazetto | 2017-03-10 | 2 | -1/+13 |
| | | | |||||
| * | | Merge branch 'fix-500-in-notes-polling' into 'master' | Rémy Coutable | 2017-03-10 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | Fix notes polling failing after code changes Closes #29327 See merge request !9862 | ||||
| | * | | Fix notes polling failing after code changes | Sean McGivern | 2017-03-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9235 | ||||
| * | | | Merge branch 'tc-fix-project-create-500' into 'master' | Douwe Maan | 2017-03-10 | 1 | -0/+2 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | Fix for creating a project through API when import_url is nil Closes #29121 See merge request !9841 | ||||
| | * | | Fix for creating a project through API when import_url is niltc-fix-project-create-500 | Toon Claes | 2017-03-10 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | 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 'dm-downtime-check-only-added-files' into 'master' | Robert Speicher | 2017-03-09 | 1 | -1/+1 |
| |\ \ \ | |_|/ |/| | | | | | | | | Only check new migrations in 'rake downtime_check' See merge request !9785 | ||||
| | * | | Only check new migrations in 'rake down_timecheck'dm-downtime-check-only-added-files | Douwe Maan | 2017-03-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | Order milestone issues by position ascending in api | George Andrinopoulos | 2017-03-09 | 1 | -2/+4 |
| | |/ |/| | |||||
| * | | Merge branch 'dz-nested-groups-members' into 'master' | Dmitriy Zaporozhets | 2017-03-09 | 1 | -1/+7 |
| |\ \ | | | | | | | | | | | | | | | | | | | Show members of parent groups on project members page Closes #28786 and #27962 See merge request !9764 | ||||
| | * | | Fix group members method for project import/export | Dmitriy Zaporozhets | 2017-03-09 | 1 | -1/+7 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Merge branch 'feature/gb/verbosify-blocked-pipeline-status' into 'master' | Kamil Trzciński | 2017-03-09 | 2 | -1/+25 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | Verbosify blocked pipeline status description Closes #29134 See merge request !9800 | ||||
| | * | | Verbosify blocked pipeline status description | Grzegorz Bizon | 2017-03-08 | 2 | -1/+25 |
| | | | | |||||
| * | | | Refactor some code29034-fix-github-importer | Gabriel Mazetto | 2017-03-08 | 1 | -2/+6 |
| | | | | |||||
| * | | | Fix name colision when importing GitHub pull requests from forked repositories | Gabriel Mazetto | 2017-03-08 | 1 | -1/+5 |
| | | | | |||||
| * | | | Fix reference to node_modules in built package | Eric Eastwood | 2017-03-08 | 2 | -2/+5 |
| | |/ |/| | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29192 See https://gitlab.slack.com/archives/frontend/p1488973548024005 | ||||
| * | | Merge branch 'fix/29093' into 'master' | Sean McGivern | 2017-03-08 | 1 | -1/+1 |
| |\ \ | |/ |/| | | | | | | | | | 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 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'issue_16834' | Douwe Maan | 2017-03-07 | 3 | -49/+122 |
| |\ \ | | | | | | | | | | | | | # Conflicts: # doc/api/v3_to_v4.md | ||||
| | * | | Remove unecessary endpoint from repository, add compatibility endpoints for ↵issue_16834 | Felipe Artur | 2017-03-07 | 3 | -45/+75 |
| | | | | | | | | | | | | | v3 and several improvements | ||||
| | * | | Update API endpoints for raw files | Felipe Artur | 2017-03-07 | 2 | -31/+74 |
| | | | | |||||
| * | | | Merge branch 'dm-nested-groups-go-get' into 'master' | Douwe Maan | 2017-03-08 | 1 | -9/+57 |
| |\ \ \ | | | | | | | | | | | | | | | | | 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/+57 |
| | |/ / | |||||
| * | | | Merge branch '1381-present-commits-pagination-headers-correctly' into 'master' | Douwe Maan | 2017-03-08 | 2 | -8/+32 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | GET "projects/:id/repository/commits" endpoint improvements Closes #1381 and #20207 See merge request !9679 | ||||
| | * | | | Returns correct header data for commits endpoint | Oswaldo Ferreira | 2017-03-07 | 2 | -13/+26 |
| | | | | | |||||
| | * | | | Fix pagination headers for repository commits api endpoint | George Andrinopoulos | 2017-03-07 | 2 | -4/+12 |
| | | | | | |||||
| | * | | | Manually set total_count when paginating commits | Jordan Ryan Reuter | 2017-03-07 | 1 | -1/+4 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Kaminari.paginate_array` takes some options, most relevant of which is a `total_count` parameter. Using the `commit_count` for `total_count` lets us correctly treat the return of `Repository#commits` as a subset of all the commits we may wish to list. Addition of a new `Repository#commit_count_for_ref` method was necessarry to allow the user to start from an arbitrary ref. Ref #1381 | ||||
| * | | | Remove user_can_download_artifacts | Toon Claes | 2017-03-07 | 2 | -32/+16 |
| | | | | | | | | | | | | | It was actually not used anywhere. | ||||
| * | | | Make it possible to query scope as scope[]= | Toon Claes | 2017-03-07 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | Since issues also accepts the query parameter iids[]=, also make it possible query scope like that. | ||||
| * | | | Add GET /projects/:id/pipelines/:pipeline_id/jobs endpoint | Toon Claes | 2017-03-07 | 1 | -0/+17 |
| |/ / | | | | | | | Add endpoint to get the jobs scoped to a pipeline. | ||||
| * | | Added Prometheus Service and Prometheus graphs | Kamil Trzciński | 2017-03-07 | 2 | -0/+79 |
| | | | |||||
| * | | Merge branch '28447-hybrid-repository-storages' into 'master' | Sean McGivern | 2017-03-07 | 7 | -19/+27 |
| |\ \ | | | | | | | | | | | | | Update storage settings to allow extra values per shard See merge request !9597 | ||||
| | * | | Update storage settings to allow extra values per shard28447-hybrid-repository-storages | Alejandro Rodríguez | 2017-03-03 | 7 | -19/+27 |
| | | | | | | | | | | | | | | | | | | | | | | This will be necessary when adding gitaly settings. This version doesn't make any functional changes, but allows us to include this breaking change in 9.0 and add the needed extra settings in the future with backwards compatibility | ||||
| * | | | Merge branch 'siemens/gitlab-ce-feature/openid-connect' | Sean McGivern | 2017-03-07 | 1 | -3/+11 |
| |\ \ \ | |||||
| | * | | | Require explicit scopes on personal access tokens | Markus Koller | 2017-03-07 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Auth and API::APIGuard already check for at least one valid scope on personal access tokens, so if the scopes are empty the token will always fail validation. | ||||
| | * | | | Only use API scopes for personal access tokens | Markus Koller | 2017-03-07 | 1 | -2/+7 |
| | | | | | |||||
| | * | | | Don't allow blocked users to authenticate through other means | Markus Koller | 2017-03-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | | Implement OpenID Connect identity provider | Markus Koller | 2017-03-07 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch ↵ | Douwe Maan | 2017-03-07 | 3 | -12/+98 |
| |\ \ \ \ | |/ / / |/| | | | | | | | '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 | 4 | -113/+37 |
| | | | | | |||||
| | * | | | refactors finder and correlated code | Tiago Botelho | 2017-03-01 | 3 | -25/+28 |
| | | | | | |||||
| | * | | | applies relevant changes to the code and code structure | Tiago Botelho | 2017-02-28 | 4 | -67/+45 |
| | | | | | |||||
| | * | | | refactors documentation and personal access tokens form to not allow admins ↵ | Tiago Botelho | 2017-02-28 | 2 | -54/+103 |
| | | | | | | | | | | | | | | | | | to generate non impersionation tokens | ||||
| | * | | | add impersonation token | Simon Vocella | 2017-02-28 | 3 | -14/+13 |
| | | | | | |||||
| | * | | | manage personal_access_tokens through api | Simon Vocella | 2017-02-28 | 4 | -0/+133 |
| | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |