summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Document the Prometheus Alertmanagerbjk/alertmanager_docsBen Kochie2018-03-152-0/+35
* Merge branch 'patch-28' into 'master'Grzegorz Bizon2018-03-151-4/+4
|\
| * Update README.mdJohn Burak2018-02-271-2/+2
| * Update README.mdJohn Burak2018-02-271-4/+4
| * Update README.mdJohn Burak2018-02-260-0/+0
| * Update README.mdJohn Burak2018-02-261-1/+1
| * Update README.mdJohn Burak2018-02-261-1/+1
| * Update README.mdJohn Burak2018-02-261-1/+1
| * Update README.mdJohn Burak2018-02-241-1/+1
* | Merge branch 'dm-mirror-hard-failed-invites' into 'master'Robert Speicher2018-03-142-3/+3
|\ \
| * | Prevent sending an access request to a project from failing when the project ...dm-mirror-hard-failed-invitesDouwe Maan2018-03-112-3/+3
* | | Merge branch 'mk/fix-move-upload-files-on-group-transfer' into 'master'Robert Speicher2018-03-145-46/+142
|\ \ \
| * | | Tag subgroup tests with :nested_groupsmk/fix-move-upload-files-on-group-transferMichael Kozono2018-03-141-1/+1
| * | | Remove obsolete commentMichael Kozono2018-03-131-1/+0
| * | | Appease Metrics/AbcSize copMichael Kozono2018-03-131-18/+22
| * | | Ensure data integrityMichael Kozono2018-03-131-1/+5
| * | | Refactor specsMichael Kozono2018-03-132-15/+27
| * | | Fix moving local files during namespace transferMichael Kozono2018-03-135-22/+99
* | | | Merge branch 'patch-24' into 'master'Douwe Maan2018-03-141-0/+1
|\ \ \ \
| * | | | Add me as proofreaderChangHo Cha2018-03-071-0/+1
* | | | | Merge branch 'patch-30' into 'master'Douwe Maan2018-03-141-0/+2
|\ \ \ \ \
| * | | | | add Indonesian proofreaderAhmad Naufal Mukhtar2018-03-061-0/+2
* | | | | | Merge branch 'tz-prettier-base' into 'master'42027-hide-hover-data-in-performance-dashboard-legendFilipa Lacerda2018-03-149-14/+214
|\ \ \ \ \ \
| * | | | | | Prettier Phase 1: Prettier Configuration, Prettifying of files and documentationTim Zallmann2018-03-149-14/+214
|/ / / / / /
* | | | | | Merge branch 'ci-lint-dispatcher-fix' into 'master'Filipa Lacerda2018-03-142-0/+1
|\ \ \ \ \ \
| * | | | | | add check for ace editor on create routeci-lint-dispatcher-fixPhil Hughes2018-03-141-0/+1
| * | | | | | Change path of CI lints create index.js filePhil Hughes2018-03-141-0/+0
* | | | | | | Merge branch 'update-net-ssh' into 'master'Douwe Maan2018-03-142-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Update net-ssh 4.1.0 -> 4.2.0 (Fixes #21734)Pirate Praveen2018-03-142-3/+3
* | | | | | | | Merge branch '43806-update-ruby-saml-to-1.7.2' into 'master'Robert Speicher2018-03-143-10/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Update ruby-saml to 1.7.2 and omniauth-saml to 1.10.0Takuya Noguchi2018-03-143-10/+15
* | | | | | | | | Merge branch 'update-fog-aws' into 'master'Robert Speicher2018-03-142-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | update fog-aws 1.4 -> 2.0Pirate Praveen2018-03-132-6/+6
* | | | | | | | | | Merge branch 'update-acts-as-taggable-on' into 'master'Robert Speicher2018-03-142-6/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update acts-as-taggable-on to 5.0Pirate Praveen2018-03-122-6/+6
* | | | | | | | | | | Merge branch 'update-sentry-raven' into 'master'Douwe Maan2018-03-142-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update sentry-raven 2.5.3 -> 2.7 (Fixes #24029)Pirate Praveen2018-03-132-3/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'update-octokit' into 'master'Douwe Maan2018-03-142-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update octokit 4.6.2 -> 4.8Pirate Praveen2018-03-142-3/+3
* | | | | | | | | | | | Merge branch 'update-ruby-prof' into 'master'Robert Speicher2018-03-142-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Update ruby-prof 0.16.2 -> 0.17.0Pirate Praveen2018-03-132-3/+3
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'update-httparty' into 'master'Grzegorz Bizon2018-03-142-4/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update httparty 0.13.3 -> 0.15.6Pirate Praveen2018-03-142-4/+3
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'bvl-import-zip-multiple-assignees' into 'master'Sean McGivern2018-03-144-15/+42
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Import multiple issue assignees from GitLab exportBob Van Landuyt2018-03-144-15/+42
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '43717-breadcrumb-on-admin-runner-page' into 'master'Sean McGivern2018-03-142-0/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Set breadcrumb for admin/runners/showTakuya Noguchi2018-03-142-0/+9
* | | | | | | | | | | | Merge branch '44160-update-foreman-to-0.84.0' into 'master'Grzegorz Bizon2018-03-143-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update foreman from 0.78.0 to 0.84.0Takuya Noguchi2018-03-133-3/+8
* | | | | | | | | | | | | Merge branch 'patch-29' into 'master'Sean McGivern2018-03-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \