summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Temp Fix for specsissue_30126_be_testsFelipe Artur2017-07-061-0/+26
* Rollback unecessary changes and add specsFelipe Artur2017-07-064-41/+18
* General fixesFelipe Artur2017-07-0613-31/+109
* Merge master into issue_30126_beFelipe Artur2017-07-06896-4479/+6150
|\
| * Merge branch '34655-label-field-for-setting-a-chart-s-legend-text-is-not-work...Tim Zallmann2017-07-064-10/+16
| |\
| | * Added test for the chart legendJose Ivan Vargas2017-07-063-1/+7
| | * Use correct field for label name, fix default for unit to be blankJoshua Lambert2017-07-061-9/+9
| * | Merge branch 'repo-limited-width' into 'master'Filipa Lacerda2017-07-061-3/+2
| |\ \
| | * | Limit the file tree view container widthrepo-limited-widthPhil Hughes2017-07-051-3/+2
| * | | Merge branch 'helm-runner-doc-certs' into 'master'Marin Jankovski2017-07-061-0/+53
| |\ \ \
| | * | | Add GitLab Runner Helm Chart documenation for cucstom certificateshelm-runner-doc-certsDJ Mountney2017-06-301-0/+53
| * | | | Merge branch 'enable-polling-env' into 'master'Kamil Trzciński2017-07-063-4/+8
| |\ \ \ \
| | * | | | Re-enable polling for environmentsenable-polling-envFilipa Lacerda2017-07-063-4/+8
| * | | | | Merge branch 'backport_slack_application_changes' into 'master'Sean McGivern2017-07-063-14/+24
| |\ \ \ \ \
| | * | | | | Backport Service changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_r...backport_slack_application_changesValery Sizov2017-07-053-14/+24
| * | | | | | Merge branch '34653-minor-ux-cleanups-for-performance-dashboard' into 'master'Tim Zallmann2017-07-066-23/+40
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Cleanup minor UX issues in the performance dashboardJose Ivan Vargas2017-07-066-23/+40
| * | | | | | Merge branch 'revert-018f7e46' into 'master'Phil Hughes2017-07-062-56/+19
| |\ \ \ \ \ \
| | * | | | | | Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'"revert-018f7e46Kamil Trzciński2017-07-062-56/+19
| * | | | | | | Merge branch '34716-environment-specific-variables-ce' into 'master'Douwe Maan2017-07-0612-35/+140
| |\ \ \ \ \ \ \
| | * | | | | | | Backports for ee-2112Lin Jen-Shin2017-07-0612-35/+140
| * | | | | | | | Merge branch '34172_add_traditional_chinese_in_taiwan_translations_of_commits...Douwe Maan2017-07-062-1/+41
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Synchronous discussion in the translationHuang Tao2017-07-061-6/+6
| | * | | | | | | | synchronize changes in community translation of msgid黄涛2017-07-051-1/+1
| | * | | | | | | | Add Traditional Chinese in Taiwan translations of Commits Page黄涛2017-07-052-53/+37
| | * | | | | | | | Merge branch '34172_add_traditional_chinese_in_taiwan_translations_of_commits...黄涛2017-07-050-0/+0
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | add changelog黄涛2017-06-231-0/+4
| | | * | | | | | | | Add Traditional Chinese in Taiwan translations of Commits Page黄涛2017-06-231-0/+52
| | * | | | | | | | | add changelog黄涛2017-07-051-0/+4
| | * | | | | | | | | Add Traditional Chinese in Taiwan translations of Commits Page黄涛2017-07-051-0/+52
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge branch '33360-generate-kubeconfig' into 'master'Kamil Trzciński2017-07-068-16/+150
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | 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