summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | Encode certificate-authority-data in base64Lin Jen-Shin2017-07-063-6/+15
| * | | | | | | | | | | Rename KUBECONFIG_FILE to KUBECONFIGLin Jen-Shin2017-07-064-4/+4
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 33360-generate-kubeconfigLin Jen-Shin2017-07-062359-20554/+43844
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix rubocop offense33360-generate-kubeconfigLin Jen-Shin2017-06-161-4/+4
| * | | | | | | | | | | | Changelog entry, doc, and only pass KUBECONFIG_FILELin Jen-Shin2017-06-164-3/+6
| * | | | | | | | | | | | Generate KUBECONFIG in KubernetesService#predefined_variablesLin Jen-Shin2017-06-166-16/+138
* | | | | | | | | | | | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Douwe Maan2017-07-0612-4/+254
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove Authentiq from the OAuth login integration tests.Timothy Andrew2017-07-062-5/+1
| * | | | | | | | | | | | Add Jasmine tests for `OAuthRememberMe`Timothy Andrew2017-07-062-0/+31
| * | | | | | | | | | | | Fix build for !11963.Timothy Andrew2017-07-063-24/+6
| * | | | | | | | | | | | Implement review comments for !11963 from @filipa.Timothy Andrew2017-07-062-4/+5
| * | | | | | | | | | | | Implement review comments for !11963 from @adamniedzielski.Timothy Andrew2017-07-065-19/+26
| * | | | | | | | | | | | Don't allow the `gitlab:env:info` rake task to mutate the list of omniauth pr...Timothy Andrew2017-07-061-1/+1
| * | | | | | | | | | | | Add CHANGELOG entry for CE MR 11963Timothy Andrew2017-07-061-0/+4
| * | | | | | | | | | | | Get ESLint spec passing for the `OAuthRememberMe` class.Timothy Andrew2017-07-061-6/+6
| * | | | | | | | | | | | Add Omniauth OAuth config to the test section of `gitlab.yml`Timothy Andrew2017-07-062-51/+67
| * | | | | | | | | | | | Add more providers to the OAuth login integration tests.Timothy Andrew2017-07-061-2/+41
| * | | | | | | | | | | | Move OAuth "remember me" javascript logic into a class.Timothy Andrew2017-07-063-14/+33
| * | | | | | | | | | | | Test the "Remember Me" flow for OAuth-based login.Timothy Andrew2017-07-063-3/+68
| * | | | | | | | | | | | Add integration tests around OAuth login.Timothy Andrew2017-07-063-1/+66
| * | | | | | | | | | | | Implement "remember me" for OAuth-based login.Timothy Andrew2017-07-062-1/+26
* | | | | | | | | | | | | Merge branch 'foreign-keys-for-project-model' into 'master'Sean McGivern2017-07-0656-248/+627
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Rename ActiverecordSerialize copYorick Peterse2017-07-0618-31/+31
| * | | | | | | | | | | | Update CI runner factories to not use invalid IDsYorick Peterse2017-07-061-2/+2
| * | | | | | | | | | | | Added Cop to blacklist the use of `dependent:`Yorick Peterse2017-07-0629-73/+140
| * | | | | | | | | | | | Add many foreign keys to the projects tableYorick Peterse2017-07-0614-146/+458
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '34636-update-prometheus-metrics-library' into 'master'Tim Zallmann2017-07-061-18/+68
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add NGINX metrics and other minor changes34636-update-prometheus-metrics-libraryJoshua Lambert2017-07-041-37/+53
| * | | | | | | | | | | | Add ELB metricsJoshua Lambert2017-07-031-2/+36
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '34698-fix-stubbing-cached-markdown-fields' into 'master'Rémy Coutable2017-07-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix stubbing attributes alongside cache_markdown_fieldNick Thomas2017-07-051-1/+1
* | | | | | | | | | | | Merge branch '33657-user-projects-api' into 'master'Rémy Coutable2017-07-066-50/+257
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add user projects APIvanadium232017-07-066-50/+257
* | | | | | | | | | | | | Merge branch '34698-fix-transient-failure' into 'master'Grzegorz Bizon2017-07-061-8/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix project_path helper arguments in wiki specs34698-fix-transient-failureGrzegorz Bizon2017-07-061-1/+1
| * | | | | | | | | | | | Fix Rubocop offenses in gitaly client ref specsGrzegorz Bizon2017-07-061-2/+2
| * | | | | | | | | | | | Fix a nasty transient failure happening is a subsequent specRémy Coutable2017-07-051-9/+18
* | | | | | | | | | | | | Merge branch 'additional-commits-integer-fix' into 'master'Sean McGivern2017-07-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix invalid integer value when more than 1000 commitsadditional-commits-integer-fixPhil Hughes2017-07-051-1/+1
* | | | | | | | | | | | | Merge branch '33772-readonly-gitlab-ci-cache' into 'master'Kamil Trzciński2017-07-0610-26/+120
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Introduce cache policies for CI jobsNick Thomas2017-07-0510-26/+120
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '32815--Add-Custom-CI-Config-Path' into 'master'Grzegorz Bizon2017-07-0620-13/+161
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'a8a4ca17e444c761ed9fc5dca4542cfec79abe55' into 32815--Add-Custo...32815--Add-Custom-CI-Config-PathGrzegorz Bizon2017-07-0549-1449/+1061
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Use a previous approach for cycle analytics dummy pipelineGrzegorz Bizon2017-07-052-4/+3
| * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-07-05192-974/+4252
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Rename ci_config_file to ci_config_pathLin Jen-Shin2017-07-0515-36/+36
| * | | | | | | | | | | | | | Add back Pipeline#ci_yaml_file_path due to all the troublesLin Jen-Shin2017-07-057-39/+37
| * | | | | | | | | | | | | | Fix cycle analytics tests by making pipeline validLin Jen-Shin2017-07-051-1/+4
| * | | | | | | | | | | | | | Make sure we remove null charactersLin Jen-Shin2017-07-041-2/+2
| * | | | | | | | | | | | | | Fix config pathLin Jen-Shin2017-07-043-3/+3