| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Ruby files that are not meant to be executable should be 644 not 755dz-fix-file-mode | Dmitriy Zaporozhets | 2017-05-15 | 1 | -0/+0 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Merge branch 'use-common-vue-for-pipeline-schedule-bundles' into 'master' | Filipa Lacerda | 2017-05-14 | 3 | -4/+7 |
| |\ | | | | | | | | | Ensure schedule_form and schedules_index both utilize common_vue bundle See merge request !11274 | ||||
| | * | ensure schedule_form and schedules_index both utilize common_vue bundleuse-common-vue-for-pipeline-schedule-bundles | Mike Greiling | 2017-05-12 | 3 | -4/+7 |
| | | | |||||
| * | | Merge branch '26325-system-hooks' into 'master' | Robert Speicher | 2017-05-13 | 19 | -11/+230 |
| |\ \ | | | | | | | | | | | | | | | | | | | Backport New SystemHook: `repository_update` Closes #26325 See merge request !11140 | ||||
| | * | | Codestyle | Gabriel Mazetto | 2017-05-13 | 1 | -1/+1 |
| | | | | |||||
| | * | | Minor cosmetic fixes in hooks admin screen | Gabriel Mazetto | 2017-05-12 | 2 | -4/+4 |
| | | | | |||||
| | * | | Documentation for repository_update_events | Gabriel Mazetto | 2017-05-12 | 1 | -1/+49 |
| | | | | |||||
| | * | | Changelog | Gabriel Mazetto | 2017-05-12 | 1 | -0/+4 |
| | | | | |||||
| | * | | Update SystemHooks API to expose and handle new repository_update_events | Gabriel Mazetto | 2017-05-12 | 3 | -3/+5 |
| | | | | |||||
| | * | | Make the new repository_update_events configurable in System Hooks UI | Gabriel Mazetto | 2017-05-12 | 6 | -2/+54 |
| | | | | |||||
| | * | | Added repository_update hook | Gabriel Mazetto | 2017-05-12 | 10 | -4/+117 |
| | | | | |||||
| * | | | Update CHANGELOG.md for 9.1.4 | Felipe Artur | 2017-05-12 | 1 | -0/+1 |
| | | | | | | | | | | [ci skip] | ||||
| * | | | Update CHANGELOG.md for 9.1.4 | Felipe Artur | 2017-05-12 | 1 | -0/+1 |
| | | | | | | | | | | [ci skip] | ||||
| * | | | Merge branch 'dm-wait-for-requests' into 'master' | Douwe Maan | 2017-05-12 | 2 | -8/+3 |
| |\ \ \ | | | | | | | | | | | | | | | | | Wait for requests after each Spinach scenario instead of feature See merge request !11349 | ||||
| | * | | | Wait for requests after each Spinach scenario instead of featuredm-wait-for-requests | Douwe Maan | 2017-05-12 | 2 | -8/+3 |
| | | | | | |||||
| * | | | | Update CHANGELOG.md for 9.1.4 | Felipe Artur | 2017-05-12 | 1 | -0/+1 |
| | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | Update CHANGELOG.md for 9.1.4 | Felipe Artur | 2017-05-12 | 9 | -33/+11 |
| | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | Merge branch 'add-problematic-mysql-examples' into 'master' | Sid Sijbrandij | 2017-05-12 | 1 | -2/+5 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Link to a case where we can't support MySQL Closes #32181 See merge request !11334 | ||||
| | * | | | Link to a case where we can't support MySQLadd-problematic-mysql-examples | Yorick Peterse | 2017-05-12 | 1 | -2/+5 |
| | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | This updates the requirements guide to include a link to an issue where we discuss dropping MySQL support for nested groups. This should give users a better understanding of why we highly recommend them to use PostgreSQL instead. [ci skip] | ||||
| * | | | Merge branch 'sh-remove-trailing-comma' into 'master' | Douwe Maan | 2017-05-12 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | Remove trailing comma in dependency linker to satisfy Rubocop See merge request !11348 | ||||
| | * | | | Remove trailing comma in dependency linker to satisfy Rubocop | Stan Hu | 2017-05-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch '30975-fixed-top-nav-POC' into 'master' | Annabel Dunstone Gray | 2017-05-12 | 24 | -35/+70 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add fixed positioning to top level navbar Closes #30975 See merge request !10751 | ||||
| | * | | | | Fix specs | Annabel Dunstone Gray | 2017-05-12 | 3 | -4/+4 |
| | | | | | | |||||
| | * | | | | Clean up fixed navbar | Annabel Dunstone Gray | 2017-05-12 | 3 | -6/+9 |
| | | | | | | |||||
| | * | | | | Fix specs | Annabel Dunstone Gray | 2017-05-12 | 13 | -25/+30 |
| | | | | | | |||||
| | * | | | | Fade out border on scroll | Annabel Dunstone Gray | 2017-05-12 | 4 | -11/+14 |
| | | | | | | |||||
| | * | | | | Add animation to navbar border | Annabel Dunstone Gray | 2017-05-12 | 1 | -2/+3 |
| | | | | | | |||||
| | * | | | | Add nav border on scroll | Annabel Dunstone Gray | 2017-05-12 | 2 | -0/+15 |
| | | | | | | |||||
| | * | | | | Remove trailing semicolon | Annabel Dunstone Gray | 2017-05-12 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Add fixed positioning to top level navbar | Annabel Dunstone Gray | 2017-05-12 | 9 | -8/+16 |
| | | | | | | |||||
| * | | | | | Merge branch 'sh-relax-backup-rake-spec' into 'master' | Stan Hu | 2017-05-12 | 1 | -1/+1 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | Relax rake backup regex to handle CE and EE RCs See merge request !11345 | ||||
| | * | | | | Relax rake backup regex to handle CE and EE RCssh-relax-backup-rake-spec | Stan Hu | 2017-05-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | See http://rubular.com/r/uTDlT85zW1 | ||||
| * | | | | | Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' | Douwe Maan | 2017-05-12 | 15 | -200/+268 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix conflict resolution from corrupted upstream Closes gitlab-ee#2128 See merge request !11298 | ||||
| | * | | | | | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-repos | Sean McGivern | 2017-05-12 | 15 | -200/+268 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't know why this happens exactly, but given an upstream and fork repository from a customer, both of which required GC, resolving conflicts would corrupt the fork so badly that it couldn't be cloned. This isn't a perfect fix for that case, because the MR may still need to be merged manually, but it does ensure that the repository is at least usable. My best guess is that when we generate the index for the conflict resolution (which we previously did in the target project), we obtain a reference to an OID that doesn't exist in the source, even though we already fetch the refs from the target into the source. Explicitly setting the source project as the place to get the merge index from seems to prevent repository corruption in this way. | ||||
| * | | | | | | Merge branch 'new-branch-new-mr-docs' into 'master' | Filipa Lacerda | 2017-05-12 | 2 | -0/+6 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | New branch new mr docs See merge request !11308 | ||||
| | * | | | | | New branch new mr docs | Victor Wu | 2017-05-12 | 2 | -0/+6 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'disable-usage-ping' into 'master' | Robert Speicher | 2017-05-12 | 9 | -67/+118 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage ping updates Closes #31741 and #31453 See merge request !11231 | ||||
| | * | | | | | update the documentation to reflect upcoming changes to the usage pingdisable-usage-ping | Job van der Voort | 2017-05-11 | 1 | -64/+9 |
| | | | | | | | |||||
| | * | | | | | Add hostname to usage ping | Sean McGivern | 2017-05-11 | 3 | -0/+6 |
| | | | | | | | |||||
| | * | | | | | Allow disabling usage ping in `gitlab.yml` | Sean McGivern | 2017-05-11 | 6 | -8/+108 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting `usage_ping_enabled` to false in `gitlab.yml`: 1. Disables the usage ping, regardless of the value stored in the database. 2. Prevents the usage ping from being enabled through the admin panel. It can only be enabled by either removing the line from `gitlab.yml` and configuring through the admin panel, or setting it to true in `gitlab.yml`. | ||||
| * | | | | | | Merge branch 'dz-project-list-cache-key' into 'master' | Douwe Maan | 2017-05-12 | 4 | -4/+16 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve project list cache key Closes #31863 See merge request !11325 | ||||
| | * | | | | | Change project list cache key to use route.cache_key instead of namespacedz-project-list-cache-key | Dmitriy Zaporozhets | 2017-05-12 | 6 | -22/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | | Add parent full path to project list cache key | Dmitriy Zaporozhets | 2017-05-12 | 5 | -1/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | Merge branch 'dm-dependency-linker-gemfile' into 'master' | Sean McGivern | 2017-05-12 | 24 | -148/+514 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autolink package names in Gemfile See merge request !11224 | ||||
| | * | | | | | | Add changelogdm-dependency-linker-gemfile | Douwe Maan | 2017-05-12 | 1 | -0/+4 |
| | | | | | | | | |||||
| | * | | | | | | Remove unrelated link from spec | Douwe Maan | 2017-05-12 | 1 | -7/+0 |
| | | | | | | | | |||||
| | * | | | | | | Link Gemfile git URLs | Douwe Maan | 2017-05-12 | 2 | -1/+8 |
| | | | | | | | | |||||
| | * | | | | | | Fix specs | Douwe Maan | 2017-05-10 | 2 | -4/+4 |
| | | | | | | | | |||||
| | * | | | | | | Turn blob dependency links blue | Douwe Maan | 2017-05-10 | 5 | -0/+25 |
| | | | | | | | | |||||
| | * | | | | | | Autolink package names in Gemfile | Douwe Maan | 2017-05-10 | 7 | -10/+263 |
| | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |