Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Fix failure in current_settings_spec.rbfix-application-setting-nil-cache | Winnie Hellmann | 2017-10-20 | 1 | -1/+1 | |
| * | | | Prevent ApplicationSetting to cache nil value | Kamil Trzcinski | 2017-10-19 | 3 | -1/+24 | |
* | | | | Merge branch 'feature/reliable-rspec-with-eval-script' into 'master' | Rémy Coutable | 2017-10-20 | 15 | -20/+39 | |
|\ \ \ \ | ||||||
| * | | | | Check for element before evaluate_script | Eric Eastwood | 2017-10-19 | 15 | -20/+39 | |
* | | | | | Merge branch 'fix-system-hook-docs' into 'master' | Sean McGivern | 2017-10-20 | 2 | -0/+7 | |
|\ \ \ \ \ | ||||||
| * | | | | | Clarify the difference between project_update and project_rename | Joe Marty | 2017-10-20 | 2 | -0/+7 | |
* | | | | | | Merge branch 'maintenance_policy' into 'master' | Achilleas Pipinellis | 2017-10-20 | 2 | -33/+82 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove empty lines. [CI skip]maintenance_policy | Marin Jankovski | 2017-10-12 | 1 | -2/+0 | |
| * | | | | | | Change location of the maintenance policy document. Add version support infor... | Marin Jankovski | 2017-10-11 | 2 | -33/+84 | |
* | | | | | | | Merge branch 'tc-page-title-encoding-fix' into 'master' | Winnie Hellmann | 2017-10-20 | 3 | -2/+16 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | URI decode Page-Title header to preserve UTF-8 characters | Toon Claes | 2017-10-20 | 3 | -2/+16 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch 'gitaly-version-v0.49.0' into 'master' | Rémy Coutable | 2017-10-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Update Gitaly version to v0.49.0 | Andrew Newdigate | 2017-10-20 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch '31358_decrease_perceived_complexity_threshold_step3' into 'master' | Rémy Coutable | 2017-10-20 | 3 | -9/+27 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Decrease Perceived Complexity threshold to 14 | Maxim Rydkin | 2017-10-20 | 3 | -9/+27 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch '39297-remove-help-text-regarding-group-issues-on-group-issues-p... | Sean McGivern | 2017-10-20 | 3 | -14/+5 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Resolve "Remove help text regarding group issues on group issues page (and gr... | Victor Wu | 2017-10-20 | 3 | -14/+5 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch 'rc/cleanup-some-jobs' into 'master' | Robert Speicher | 2017-10-20 | 1 | -9/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Improve the build-package and .review-docs jobsrc/cleanup-some-jobs | Rémy Coutable | 2017-10-18 | 1 | -9/+1 | |
* | | | | | | | | Merge branch 'fix-non-diff-resolved-discussion' into 'master' | Phil Hughes | 2017-10-20 | 3 | -7/+29 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Force non diff resolved discussion to display when collapse toggled | Clement Ho | 2017-10-20 | 3 | -7/+29 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch '37391-wiki-disk-path-helper' into 'master' | Nick Thomas | 2017-10-20 | 4 | -4/+4 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | ||||||
| * | | | | | | | Use wiki.disk_path | Nick Thomas | 2017-10-18 | 4 | -4/+4 | |
* | | | | | | | | Merge branch 'patch-24' into 'master' | Rémy Coutable | 2017-10-20 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | add note about after_script being run separately | Martin Nowak | 2017-10-20 | 1 | -0/+6 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'animate-auto-devops' into 'master' | Annabel Dunstone Gray | 2017-10-20 | 3 | -2/+18 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Animate auto devops graphicanimate-auto-devops | Clement Ho | 2017-10-18 | 3 | -2/+18 | |
* | | | | | | | | | Merge branch 'update-nav-sidebar-hover' into 'master' | Annabel Dunstone Gray | 2017-10-19 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | update nav sidebar hover color to increase contrastupdate-nav-sidebar-hover | tauriedavis | 2017-10-11 | 1 | -3/+3 | |
* | | | | | | | | | Merge branch 'docs/Wernight/gitlab-ce-patch-28' into 'master' | Achilleas Pipinellis | 2017-10-19 | 1 | -19/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Updates google.md to match current version.docs/Wernight/gitlab-ce-patch-28 | Werner Beroux | 2017-10-17 | 1 | -19/+0 | |
* | | | | | | | | | | Merge branch 'sh-document-plus-encoding-api' into 'master' | Achilleas Pipinellis | 2017-10-19 | 1 | -0/+17 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Document converting `+` to `%2B` in an API query parametersh-document-plus-encoding-api | Stan Hu | 2017-10-18 | 1 | -0/+17 | |
| | |_|_|_|/ / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'sh-api-json-logs' into 'master' | Achilleas Pipinellis | 2017-10-19 | 1 | -2/+22 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Add docs for `api_json.log` filesh-api-json-logs | Stan Hu | 2017-10-18 | 1 | -2/+22 | |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master' | Douwe Maan | 2017-10-19 | 15 | -1147/+8176 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Merge branch 'master-i18n' into 'master' | Douwe Maan | 2017-10-19 | 15 | -1147/+8176 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'pawel/upgrade_prometheus_gem_to_fix_problem_with_file_locking' ... | Stan Hu | 2017-10-19 | 2 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Update Prometheus gem to fix problems with other files overwriting current file | Pawel Chojnacki | 2017-10-19 | 2 | -3/+3 | |
* | | | | | | | | | | | Merge branch 'rc/balance-test-job-nodes' into 'master' | Robert Speicher | 2017-10-19 | 1 | -63/+63 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Reduce Spinach parallelization to 4 nodes and increase RSpec's to 26 nodesrc/balance-test-job-nodes | Rémy Coutable | 2017-10-18 | 1 | -63/+63 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'rc/reduce-duplication-in-tests-metadata-state-job-definition' i... | Robert Speicher | 2017-10-19 | 1 | -9/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Improve the .tests-metadata-state definition a bitrc/reduce-duplication-in-tests-metadata-state-job-definition | Rémy Coutable | 2017-10-18 | 1 | -9/+4 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch '18765-stub_env_in_specs' into 'master' | Robert Speicher | 2017-10-19 | 9 | -202/+246 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add a new RSpec::EnvAssignment cop to prevent assigning to ENV in specs18765-stub_env_in_specs | Rémy Coutable | 2017-10-18 | 4 | -5/+135 | |
| * | | | | | | | | | | | Stub ENV in the LDAP task spec file | Rémy Coutable | 2017-10-18 | 1 | -1/+1 | |
| * | | | | | | | | | | | Stub ENV in the Gitaly task spec file | Rémy Coutable | 2017-10-18 | 1 | -8/+1 | |
| * | | | | | | | | | | | Stub ENV in the backup task spec file | Rémy Coutable | 2017-10-18 | 3 | -188/+109 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'not-found-in-commits' into 'master' | Douwe Maan | 2017-10-19 | 4 | -3/+37 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Renders 404 in commits controller if no commits are found | Guilherme Vieira | 2017-10-18 | 4 | -3/+37 |