summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '34716-environment-specific-variables-ce' into 'master'Douwe Maan2017-07-063-3/+33
|\
| * Backports for ee-2112Lin Jen-Shin2017-07-063-3/+33
* | Merge branch '33360-generate-kubeconfig' into 'master'Kamil Trzciński2017-07-061-0/+39
|\ \
| * | Encode certificate-authority-data in base64Lin Jen-Shin2017-07-061-1/+1
| * | Merge remote-tracking branch 'upstream/master' into 33360-generate-kubeconfigLin Jen-Shin2017-07-06188-920/+3205
| |\ \ | | |/
| * | Fix rubocop offense33360-generate-kubeconfigLin Jen-Shin2017-06-161-4/+4
| * | Generate KUBECONFIG in KubernetesService#predefined_variablesLin Jen-Shin2017-06-161-0/+39
* | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Douwe Maan2017-07-061-2/+1
|\ \ \
| * | | Implement review comments for !11963 from @adamniedzielski.Timothy Andrew2017-07-061-2/+1
| * | | Don't allow the `gitlab:env:info` rake task to mutate the list of omniauth pr...Timothy Andrew2017-07-061-1/+1
* | | | Merge branch '33657-user-projects-api' into 'master'Rémy Coutable2017-07-062-49/+67
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add user projects APIvanadium232017-07-062-49/+67
* | | | Merge branch '33772-readonly-gitlab-ci-cache' into 'master'Kamil Trzciński2017-07-062-3/+13
|\ \ \ \
| * | | | Introduce cache policies for CI jobsNick Thomas2017-07-052-3/+13
* | | | | Merge branch '32815--Add-Custom-CI-Config-Path' into 'master'Grzegorz Bizon2017-07-062-0/+2
|\ \ \ \ \
| * \ \ \ \ Merge commit 'a8a4ca17e444c761ed9fc5dca4542cfec79abe55' into 32815--Add-Custo...32815--Add-Custom-CI-Config-PathGrzegorz Bizon2017-07-051-1/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-07-0521-99/+365
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Rename ci_config_file to ci_config_pathLin Jen-Shin2017-07-052-2/+2
| * | | | | | Fix various descriptions given the feedbackLin Jen-Shin2017-07-041-1/+1
| * | | | | | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-07-038-55/+16
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-06-3029-73/+1519
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 15041-Add-Custom-CI-Confi...15041-Add-Custom-CI-Config-PathLin Jen-Shin2017-06-28725-7486/+32320
| |\ \ \ \ \ \ \
| * | | | | | | | Add config option to project to allow custom .gitlab-ci.yml locationKeith Pope2016-10-082-0/+7
* | | | | | | | | Merge branch '32408-allow-creation-of-files-and-dirs-with-spaces-in-web-ui' i...Douwe Maan2017-07-052-12/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Removes file_name_regex from Gitlab::Regex32408-allow-creation-of-files-and-dirs-with-spaces-in-web-uiTiago Botelho2017-07-052-12/+0
| * | | | | | | | Allow creation of files and directories with spaces in web UITiago Botelho2017-07-051-1/+1
* | | | | | | | | 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
| |_|_|_|/ / / / |/| | | | | | |
View Lorry Controller Status