Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge branch 'bvl-fix-group-atom-feed' into 'master' | Douwe Maan | 2017-10-22 | 3 | -0/+41 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we render events for projects within a group Closes #39305 See merge request gitlab-org/gitlab-ce!14974 | |||||
| * | | | | | | | | Make sure we render events for projects within a group | Bob Van Landuyt | 2017-10-20 | 3 | -0/+41 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Update VERSION to 10.2.0-prev10.2.0.pre | Stan Hu | 2017-10-21 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | Update CHANGELOG.md for 10.1.0 | Stan Hu | 2017-10-21 | 187 | -932/+192 | |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Stan Hu | 2017-10-21 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT` | Alessio Caiazza | 2017-10-21 | 1 | -0/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Fix the external URLs generated for online view of HTML artifacts | Nick Thomas | 2017-10-21 | 3 | -10/+19 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Use title as placeholder instead of issue title for reusability | Clement Ho | 2017-10-21 | 4 | -7/+12 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Fix failure in current_settings_spec.rb | Winnie Hellmann | 2017-10-21 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Clarify the difference between project_update and project_rename | Joe Marty | 2017-10-21 | 2 | -0/+7 | |
| | | | | | | | | | ||||||
| * | | | | | | | | URI decode Page-Title header to preserve UTF-8 characters | Toon Claes | 2017-10-21 | 3 | -2/+16 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Update Gitaly version to v0.49.0 | Andrew Newdigate | 2017-10-21 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Decrease Perceived Complexity threshold to 14 | Maxim Rydkin | 2017-10-21 | 3 | -9/+27 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Resolve "Remove help text regarding group issues on group issues page (and ↵ | Victor Wu | 2017-10-21 | 3 | -14/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | group merge requests page)" | |||||
| * | | | | | | | | Force non diff resolved discussion to display when collapse toggled | Clement Ho | 2017-10-21 | 3 | -7/+29 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Added submodule support in multi-file editor | Phil Hughes | 2017-10-21 | 8 | -5/+75 | |
| | | | | | | | | | ||||||
| * | | | | | | | | add note about after_script being run separately | Martin Nowak | 2017-10-21 | 1 | -0/+6 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Check for element before evaluate_script | Eric Eastwood | 2017-10-21 | 15 | -20/+39 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tip from https://robots.thoughtbot.com/write-reliable-asynchronous-integration-tests-with-capybara#directly-interacting-with-javascript | |||||
| * | | | | | | | | Merge branch 'master-i18n' into 'master' | Douwe Maan | 2017-10-21 | 15 | -1147/+8176 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New Crowdin translations See merge request gitlab-org/gitlab-ee!3030 | |||||
| * | | | | | | | | Update Prometheus gem to fix problems with other files overwriting current file | Pawel Chojnacki | 2017-10-21 | 2 | -3/+3 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Prevent ApplicationSetting to cache nil value | Kamil Trzcinski | 2017-10-21 | 3 | -1/+24 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Remove dropzoneInput from global namespace | Filipa Lacerda | 2017-10-21 | 7 | -309/+269 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Add docs for `api_json.log` file | Stan Hu | 2017-10-21 | 1 | -2/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | | | | | Fix broken function invocation | Filipa Lacerda | 2017-10-21 | 2 | -2/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Fix inability to delete container registry tags | Stan Hu | 2017-10-21 | 2 | -3/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because container registry tags can have periods, the addition of the `.json` format caused ambiguity. Since the tag name regex is greedy, it would attempt to locate an image named `foo.json` instead of `foo`. Closes #39260 | |||||
| * | | | | | | | | Document converting `+` to `%2B` in an API query parameter | Stan Hu | 2017-10-21 | 1 | -0/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | | | | | Renders 404 in commits controller if no commits are found | Guilherme Vieira | 2017-10-21 | 4 | -3/+37 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Avoind unnecesary `force_encoding` operations | Alejandro Rodríguez | 2017-10-21 | 2 | -4/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They're costly. This will also avoid some edge cases where charlock_holmes assigns a weird encoding to a perfectly valid UTF-8 string. | |||||
| * | | | | | | | | Add members flyout on collapsed sidebar | Annabel Dunstone Gray | 2017-10-21 | 1 | -0/+5 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Update GraphQL licensing situation in the docs | Nick Thomas | 2017-10-21 | 2 | -1/+17 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Improve the build-package and .review-docs jobs | Rémy Coutable | 2017-10-21 | 1 | -9/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
| * | | | | | | | | Reduce Spinach parallelization to 4 nodes and increase RSpec's to 26 nodes | Rémy Coutable | 2017-10-21 | 1 | -63/+63 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
| * | | | | | | | | Improve the .tests-metadata-state definition a bit | Rémy Coutable | 2017-10-21 | 1 | -9/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
| * | | | | | | | | Add a new RSpec::EnvAssignment cop to prevent assigning to ENV in specs | Rémy Coutable | 2017-10-21 | 4 | -5/+135 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
| * | | | | | | | | Stub ENV in the LDAP task spec file | Rémy Coutable | 2017-10-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
| * | | | | | | | | Stub ENV in the Gitaly task spec file | Rémy Coutable | 2017-10-21 | 1 | -8/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
| * | | | | | | | | Stub ENV in the backup task spec file | Rémy Coutable | 2017-10-21 | 3 | -188/+109 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
| * | | | | | | | | Animate auto devops graphic | Clement Ho | 2017-10-21 | 3 | -2/+18 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Use wiki.disk_path | Nick Thomas | 2017-10-21 | 4 | -4/+4 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Updates google.md to match current version. | Werner Beroux | 2017-10-21 | 1 | -19/+0 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Remove empty lines. [CI skip] | Marin Jankovski | 2017-10-21 | 1 | -2/+0 | |
| | | | | | | | | | ||||||
| * | | | | | | | | update nav sidebar hover color to increase contrast | tauriedavis | 2017-10-21 | 1 | -3/+3 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Change location of the maintenance policy document. Add version support ↵ | Marin Jankovski | 2017-10-21 | 2 | -33/+84 | |
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | information. [CI skip] | |||||
* | | | | | | | | Merge branch '39189-online-view-of-html-artifacts-is-broken' into 'master'27375-dashboardcontroller-activity-json-is-slow-due-to-sql | Grzegorz Bizon | 2017-10-21 | 3 | -10/+19 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Online view of HTML artifacts is broken?" Closes #39189 See merge request gitlab-org/gitlab-ce!14977 | |||||
| * | | | | | | | | Fix the external URLs generated for online view of HTML artifacts | Nick Thomas | 2017-10-20 | 3 | -10/+19 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'docs/ci-disposable-environment' into 'master' | Achilleas Pipinellis | 2017-10-21 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT` See merge request gitlab-org/gitlab-ce!14781 | |||||
| * | | | | | | | | Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT` | Alessio Caiazza | 2017-10-21 | 1 | -0/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'multi-file-editor-submodules' into 'master' | Filipa Lacerda | 2017-10-20 | 8 | -5/+75 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added submodule support in multi-file editor See merge request gitlab-org/gitlab-ce!14971 | |||||
| * | | | | | | | | Added submodule support in multi-file editor | Phil Hughes | 2017-10-20 | 8 | -5/+75 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'use-title' into 'master' | Filipa Lacerda | 2017-10-20 | 4 | -7/+12 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use title as placeholder instead of issue title for reusability Closes gitlab-ee#3781 See merge request gitlab-org/gitlab-ce!14927 |