summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ruby files that are not meant to be executable should be 644 not 755dz-fix-file-modeDmitriy Zaporozhets2017-05-151-0/+0
* Merge branch 'use-common-vue-for-pipeline-schedule-bundles' into 'master' Filipa Lacerda2017-05-143-4/+7
|\
| * ensure schedule_form and schedules_index both utilize common_vue bundleuse-common-vue-for-pipeline-schedule-bundlesMike Greiling2017-05-123-4/+7
* | Merge branch '26325-system-hooks' into 'master' Robert Speicher2017-05-1319-11/+230
|\ \
| * | CodestyleGabriel Mazetto2017-05-131-1/+1
| * | Minor cosmetic fixes in hooks admin screenGabriel Mazetto2017-05-122-4/+4
| * | Documentation for repository_update_eventsGabriel Mazetto2017-05-121-1/+49
| * | ChangelogGabriel Mazetto2017-05-121-0/+4
| * | Update SystemHooks API to expose and handle new repository_update_eventsGabriel Mazetto2017-05-123-3/+5
| * | Make the new repository_update_events configurable in System Hooks UIGabriel Mazetto2017-05-126-2/+54
| * | Added repository_update hookGabriel Mazetto2017-05-1210-4/+117
* | | Update CHANGELOG.md for 9.1.4Felipe Artur2017-05-121-0/+1
* | | Update CHANGELOG.md for 9.1.4Felipe Artur2017-05-121-0/+1
* | | Merge branch 'dm-wait-for-requests' into 'master' Douwe Maan2017-05-122-8/+3
|\ \ \
| * | | Wait for requests after each Spinach scenario instead of featuredm-wait-for-requestsDouwe Maan2017-05-122-8/+3
* | | | Update CHANGELOG.md for 9.1.4Felipe Artur2017-05-121-0/+1
* | | | Update CHANGELOG.md for 9.1.4Felipe Artur2017-05-129-33/+11
* | | | Merge branch 'add-problematic-mysql-examples' into 'master' Sid Sijbrandij2017-05-121-2/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Link to a case where we can't support MySQLadd-problematic-mysql-examplesYorick Peterse2017-05-121-2/+5
| | |/ | |/|
* | | Merge branch 'sh-remove-trailing-comma' into 'master' Douwe Maan2017-05-121-1/+1
|\ \ \
| * | | Remove trailing comma in dependency linker to satisfy RubocopStan Hu2017-05-121-1/+1
* | | | Merge branch '30975-fixed-top-nav-POC' into 'master' Annabel Dunstone Gray2017-05-1224-35/+70
|\ \ \ \
| * | | | Fix specsAnnabel Dunstone Gray2017-05-123-4/+4
| * | | | Clean up fixed navbarAnnabel Dunstone Gray2017-05-123-6/+9
| * | | | Fix specsAnnabel Dunstone Gray2017-05-1213-25/+30
| * | | | Fade out border on scrollAnnabel Dunstone Gray2017-05-124-11/+14
| * | | | Add animation to navbar borderAnnabel Dunstone Gray2017-05-121-2/+3
| * | | | Add nav border on scrollAnnabel Dunstone Gray2017-05-122-0/+15
| * | | | Remove trailing semicolonAnnabel Dunstone Gray2017-05-121-1/+1
| * | | | Add fixed positioning to top level navbarAnnabel Dunstone Gray2017-05-129-8/+16
* | | | | Merge branch 'sh-relax-backup-rake-spec' into 'master' Stan Hu2017-05-121-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Relax rake backup regex to handle CE and EE RCssh-relax-backup-rake-specStan Hu2017-05-121-1/+1
* | | | | Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' Douwe Maan2017-05-1215-200/+268
|\ \ \ \ \
| * | | | | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-1215-200/+268
* | | | | | Merge branch 'new-branch-new-mr-docs' into 'master' Filipa Lacerda2017-05-122-0/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | New branch new mr docsVictor Wu2017-05-122-0/+6
|/ / / / /
* | | | | Merge branch 'disable-usage-ping' into 'master'Robert Speicher2017-05-129-67/+118
|\ \ \ \ \
| * | | | | update the documentation to reflect upcoming changes to the usage pingdisable-usage-pingJob van der Voort2017-05-111-64/+9
| * | | | | Add hostname to usage pingSean McGivern2017-05-113-0/+6
| * | | | | Allow disabling usage ping in `gitlab.yml`Sean McGivern2017-05-116-8/+108
* | | | | | Merge branch 'dz-project-list-cache-key' into 'master' Douwe Maan2017-05-124-4/+16
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Change project list cache key to use route.cache_key instead of namespacedz-project-list-cache-keyDmitriy Zaporozhets2017-05-126-22/+5
| * | | | | Add parent full path to project list cache keyDmitriy Zaporozhets2017-05-125-1/+30
* | | | | | Merge branch 'dm-dependency-linker-gemfile' into 'master' Sean McGivern2017-05-1224-148/+514
|\ \ \ \ \ \
| * | | | | | Add changelogdm-dependency-linker-gemfileDouwe Maan2017-05-121-0/+4
| * | | | | | Remove unrelated link from specDouwe Maan2017-05-121-7/+0
| * | | | | | Link Gemfile git URLsDouwe Maan2017-05-122-1/+8
| * | | | | | Fix specsDouwe Maan2017-05-102-4/+4
| * | | | | | Turn blob dependency links blueDouwe Maan2017-05-105-0/+25
| * | | | | | Autolink package names in GemfileDouwe Maan2017-05-107-10/+263