Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change new nav purple to indigo34402-navigation-color-palette-for-new-navigation | Pedro Moreira da Silva | 2017-07-07 | 3 | -73/+132 |
* | Merge branch 'repo-limited-width' into 'master' | Filipa Lacerda | 2017-07-06 | 1 | -3/+2 |
|\ | |||||
| * | Limit the file tree view container widthrepo-limited-width | Phil Hughes | 2017-07-05 | 1 | -3/+2 |
* | | Merge branch 'enable-polling-env' into 'master' | Kamil Trzciński | 2017-07-06 | 1 | -0/+2 |
|\ \ | |||||
| * | | Re-enable polling for environmentsenable-polling-env | Filipa Lacerda | 2017-07-06 | 1 | -0/+2 |
* | | | Merge branch 'backport_slack_application_changes' into 'master' | Sean McGivern | 2017-07-06 | 3 | -14/+24 |
|\ \ \ | |||||
| * | | | Backport Service changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_r...backport_slack_application_changes | Valery Sizov | 2017-07-05 | 3 | -14/+24 |
* | | | | Merge branch '34653-minor-ux-cleanups-for-performance-dashboard' into 'master' | Tim Zallmann | 2017-07-06 | 5 | -23/+36 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Cleanup minor UX issues in the performance dashboard | Jose Ivan Vargas | 2017-07-06 | 5 | -23/+36 |
* | | | | Merge branch 'revert-018f7e46' into 'master' | Phil Hughes | 2017-07-06 | 1 | -8/+1 |
|\ \ \ \ | |||||
| * | | | | Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'"revert-018f7e46 | Kamil Trzciński | 2017-07-06 | 1 | -8/+1 |
* | | | | | Merge branch '34716-environment-specific-variables-ce' into 'master' | Douwe Maan | 2017-07-06 | 3 | -14/+25 |
|\ \ \ \ \ | |||||
| * | | | | | Backports for ee-2112 | Lin Jen-Shin | 2017-07-06 | 3 | -14/+25 |
* | | | | | | Merge branch '33360-generate-kubeconfig' into 'master' | Kamil Trzciński | 2017-07-06 | 1 | -1/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Rename KUBECONFIG_FILE to KUBECONFIG | Lin Jen-Shin | 2017-07-06 | 1 | -1/+1 |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 33360-generate-kubeconfig | Lin Jen-Shin | 2017-07-06 | 797 | -8975/+11514 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Changelog entry, doc, and only pass KUBECONFIG_FILE | Lin Jen-Shin | 2017-06-16 | 1 | -2/+1 |
| * | | | | | | | Generate KUBECONFIG in KubernetesService#predefined_variables | Lin Jen-Shin | 2017-06-16 | 1 | -1/+13 |
* | | | | | | | | Merge branch '18000-remember-me-for-oauth-login' into 'master' | Douwe Maan | 2017-07-06 | 4 | -1/+46 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Fix build for !11963. | Timothy Andrew | 2017-07-06 | 1 | -1/+1 |
| * | | | | | | | Implement review comments for !11963 from @filipa. | Timothy Andrew | 2017-07-06 | 2 | -4/+5 |
| * | | | | | | | Implement review comments for !11963 from @adamniedzielski. | Timothy Andrew | 2017-07-06 | 1 | -1/+1 |
| * | | | | | | | Get ESLint spec passing for the `OAuthRememberMe` class. | Timothy Andrew | 2017-07-06 | 1 | -6/+6 |
| * | | | | | | | Move OAuth "remember me" javascript logic into a class. | Timothy Andrew | 2017-07-06 | 3 | -14/+33 |
| * | | | | | | | Add integration tests around OAuth login. | Timothy Andrew | 2017-07-06 | 1 | -1/+1 |
| * | | | | | | | Implement "remember me" for OAuth-based login. | Timothy Andrew | 2017-07-06 | 2 | -1/+26 |
* | | | | | | | | Merge branch 'foreign-keys-for-project-model' into 'master' | Sean McGivern | 2017-07-06 | 39 | -164/+190 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Rename ActiverecordSerialize cop | Yorick Peterse | 2017-07-06 | 15 | -27/+27 |
| * | | | | | | | | Added Cop to blacklist the use of `dependent:` | Yorick Peterse | 2017-07-06 | 26 | -73/+80 |
| * | | | | | | | | Add many foreign keys to the projects table | Yorick Peterse | 2017-07-06 | 3 | -68/+87 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch '34698-fix-stubbing-cached-markdown-fields' into 'master' | Rémy Coutable | 2017-07-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix stubbing attributes alongside cache_markdown_field | Nick Thomas | 2017-07-05 | 1 | -1/+1 |
* | | | | | | | | Merge branch '33657-user-projects-api' into 'master' | Rémy Coutable | 2017-07-06 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Add user projects API | vanadium23 | 2017-07-06 | 1 | -1/+8 |
* | | | | | | | | Merge branch 'additional-commits-integer-fix' into 'master' | Sean McGivern | 2017-07-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Fix invalid integer value when more than 1000 commitsadditional-commits-integer-fix | Phil Hughes | 2017-07-05 | 1 | -1/+1 |
* | | | | | | | | Merge branch '32815--Add-Custom-CI-Config-Path' into 'master' | Grzegorz Bizon | 2017-07-06 | 6 | -8/+42 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge commit 'a8a4ca17e444c761ed9fc5dca4542cfec79abe55' into 32815--Add-Custo...32815--Add-Custom-CI-Config-Path | Grzegorz Bizon | 2017-07-05 | 26 | -1028/+968 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf... | Lin Jen-Shin | 2017-07-05 | 61 | -348/+516 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Rename ci_config_file to ci_config_path | Lin Jen-Shin | 2017-07-05 | 4 | -9/+9 |
| * | | | | | | | | | Add back Pipeline#ci_yaml_file_path due to all the troubles | Lin Jen-Shin | 2017-07-05 | 4 | -14/+14 |
| * | | | | | | | | | Fix config path | Lin Jen-Shin | 2017-07-04 | 2 | -2/+2 |
| * | | | | | | | | | Also remove null character | Lin Jen-Shin | 2017-07-04 | 1 | -1/+1 |
| * | | | | | | | | | Follow feedback on the merge request | Lin Jen-Shin | 2017-07-04 | 3 | -14/+14 |
| * | | | | | | | | | Fix various descriptions given the feedback | Lin Jen-Shin | 2017-07-04 | 1 | -1/+1 |
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf... | Lin Jen-Shin | 2017-07-03 | 55 | -378/+603 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Introduce CI_CONFIG_PATH | Lin Jen-Shin | 2017-06-30 | 1 | -1/+2 |
| * | | | | | | | | | | Update wordings, allow only full path, add tests | Lin Jen-Shin | 2017-06-30 | 3 | -15/+14 |
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf... | Lin Jen-Shin | 2017-06-30 | 165 | -2255/+3554 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix the test and implement missing update | Lin Jen-Shin | 2017-06-28 | 1 | -0/+2 |