summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-0522-63/+33
* Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'"revert-6df61942Sean McGivern2017-07-051-1/+2
* Merge branch '33580-fix-api-scoping' into 'master'Douwe Maan2017-07-057-23/+70
|\
| * Merge branch 'master' into '33580-fix-api-scoping'Douwe Maan2017-07-0440-160/+1605
| |\
| * | `AccessTokenValidationService` accepts `String` or `API::Scope` scopes.Timothy Andrew2017-06-302-2/+1
| * | Extract a `Gitlab::Scope` class.Timothy Andrew2017-06-293-3/+26
| * | Implement review comments from @DouweM for !12300.Timothy Andrew2017-06-282-3/+4
| * | Implement review comments from @dbalexandre for !12300.Timothy Andrew2017-06-282-9/+7
| * | Fix remaining spec failures for !12300.Timothy Andrew2017-06-282-4/+4
| * | When verifying scopes, manually include scopes from `API::API`.Timothy Andrew2017-06-282-10/+23
| * | Allow API scope declarations to be applied conditionally.Timothy Andrew2017-06-282-3/+3
| * | Initial attempt at refactoring API scope declarations.Timothy Andrew2017-06-285-17/+33
* | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Sean McGivern2017-07-051-2/+1
|\ \ \
| * | | Implement review comments for !11963 from @adamniedzielski.Timothy Andrew2017-07-031-2/+1
| * | | Don't allow the `gitlab:env:info` rake task to mutate the list of omniauth pr...Timothy Andrew2017-07-031-1/+1
* | | | Merge branch 'sh-fix-bad-rails-logger' into 'master'Rémy Coutable2017-07-051-1/+1
|\ \ \ \
| * | | | Fix invalid Rails.logger call in lib/gitlab/health_checks/fs_shards_check.rbsh-fix-bad-rails-loggerStan Hu2017-07-041-1/+1
* | | | | Merge branch 'gitaly-submodule-url-for' into 'master'Sean McGivern2017-07-051-5/+20
|\ \ \ \ \
| * | | | | Migrate #submodule_url_for to GitalyJacob Vosmaer2017-07-051-5/+20
* | | | | | Merge branch 'dm-encode-tree-and-blob-paths' into 'master'Rémy Coutable2017-07-052-0/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix issues with non-UTF8 filenames by always fixing the encoding of tree and ...dm-encode-tree-and-blob-pathsDouwe Maan2017-07-042-0/+8
* | | | | | Merge branch '34544_add_italian_translation_of_i18n' into 'master'34621-add-subgroups-limitations-to-pages-docsDouwe Maan2017-07-041-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | add Italian translation to I18N黄涛2017-06-301-1/+2
* | | | | | Instrument Unicorn with Ruby exporterPaweł Chojnacki2017-07-045-38/+193
| |_|_|_|/ |/| | | |
* | | | | Merge branch '34141-allow-unauthenticated-access-to-the-users-api' into 'master'Rémy Coutable2017-07-041-6/+20
|\ \ \ \ \
| * | | | | Simplify authentication logic in the v4 users API for !12445.Timothy Andrew2017-07-042-7/+8
| * | | | | Merge remote-tracking branch 'origin/master' into 34141-allow-unauthenticated...Timothy Andrew2017-06-3044-190/+1672
| |\ \ \ \ \
| * | | | | | Implement review comments for !12445 from @godfat and @rymai.Timothy Andrew2017-06-302-17/+13
| * | | | | | Allow unauthenticated access to the `/api/v4/users` API.Timothy Andrew2017-06-262-6/+23
* | | | | | | Merge branch 'gitaly-clean-up-tests' into 'master'Sean McGivern2017-07-041-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add test for GitalyClient::Ref#find_ref_nameJacob Vosmaer2017-07-041-1/+1
| | |/ / / / | |/| | | |
* | | | | | Optimize creation of commit API by using Repository#commit instead of Reposit...sh-optimize-project-commit-apiStan Hu2017-07-031-1/+1
* | | | | | Speed up operations performed by gitlab-shellStan Hu2017-07-031-21/+48
| |_|_|/ / |/| | | |
* | | | | Merge branch 'change-extended-docker-configuration-syntax' into 'master'Grzegorz Bizon2017-07-022-3/+3
|\ \ \ \ \
| * | | | | Make entrypoint and command keys to be array of stringsTomasz Maczukin2017-07-022-3/+3
* | | | | | Merge branch 'enable-webpack-code-splitting' into 'master'Jacob Schatz2017-06-301-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | configure webpack publicPath dynamically to account for CDN or relative path ...Mike Greiling2017-06-281-0/+3
* | | | | | Improve support for external issue referencesadam-external-issue-references-spikeAdam Niedzielski2017-06-304-49/+5
| |/ / / / |/| | | |
* | | | | Merge branch '34502-gitlab-git-hook-should-set-the-gl_repository-environment-...Dmitriy Zaporozhets2017-06-301-3/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Set the GL_REPOSITORY env variable on Gitlab::Git::Hook34502-gitlab-git-hook-should-set-the-gl_repository-environment-variableAlejandro Rodríguez2017-06-291-3/+5
* | | | | bugfix: use `require_dependency` to bring in DeclarativePolicybugfix/declarative-policy-reloadinghttp://jneen.net/2017-06-291-1/+1
|/ / / /
* | | | Merge branch '34078-allow-to-enable-feature-flags-with-more-granularity' into...Robert Speicher2017-06-292-11/+50
|\ \ \ \
| * | | | Rename flipper_group to feature_group34078-allow-to-enable-feature-flags-with-more-granularityRémy Coutable2017-06-281-4/+4
| * | | | Rename FLippable to FeatureGate and make `flipper_group` and `user` mutually ...Rémy Coutable2017-06-271-0/+1
| * | | | Allow the feature flags to be enabled/disabled with more granularityRémy Coutable2017-06-272-11/+49
* | | | | Merge branch 'sha-attributes-for-postgresql-and-mysql' into 'master'Sean McGivern2017-06-291-0/+34
|\ \ \ \ \
| * | | | | Added code for defining SHA attributesYorick Peterse2017-06-291-0/+34
* | | | | | Merge branch 'zj-usage-ping-only-gl-pipelines' into 'master'Kamil Trzciński2017-06-291-1/+2
|\ \ \ \ \ \
| * | | | | | Split pipelines by origin on usage datazj-usage-ping-only-gl-pipelinesZ.J. van de Weg2017-06-271-1/+2
* | | | | | | Merge branch 'refactor/declarative-policy' into 'master'Sean McGivern2017-06-2912-3/+1230
|\ \ \ \ \ \ \
View Lorry Controller Status