summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Backport Service changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_r...backport_slack_application_changesValery Sizov2017-07-053-14/+24
* Merge branch 'new-nav-column-fix' into 'master'Filipa Lacerda2017-07-051-2/+2
|\
| * Fixes the column widths for the new navigation options in settingsPhil Hughes2017-07-051-2/+2
* | Merge branch 'sh-fix-bad-rails-logger' into 'master'Rémy Coutable2017-07-051-1/+1
|\ \
| * | Fix invalid Rails.logger call in lib/gitlab/health_checks/fs_shards_check.rbsh-fix-bad-rails-loggerStan Hu2017-07-041-1/+1
* | | Merge branch 'sh-log-application-controller-exceptions-sentry' into 'master'Rémy Coutable2017-07-052-0/+6
|\ \ \
| * | | Log rescued exceptions to Sentrysh-log-application-controller-exceptions-sentryStan Hu2017-07-042-0/+6
* | | | Merge branch 'feature/gb/add-test-example-for-commit-status-retries' into 'ma...Sean McGivern2017-07-051-0/+22
|\ \ \ \
| * | | | Add test example for external commit status retriesfeature/gb/add-test-example-for-commit-status-retriesGrzegorz Bizon2017-07-051-0/+22
* | | | | Merge branch 'fix/gb/improve-stage-id-foreign-key-migration' into 'master'Kamil Trzciński2017-07-053-10/+41
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'fix/gb/improve-stage-id-foreign-key-migration'fix/gb/improve-stage-id-foreign-key-migrationGrzegorz Bizon2017-07-0429-72/+383
| |\ \ \ \ \
| * | | | | | Check foreign keys in migration in separate conditionalGrzegorz Bizon2017-07-041-1/+15
| * | | | | | Bump database schema versionGrzegorz Bizon2017-07-041-1/+1
| * | | | | | Improve stage_id in ci_builds foreign key migrationGrzegorz Bizon2017-07-032-9/+26
| | |/ / / / | |/| | | |
* | | | | | Merge branch '34531-remove-scroll' into 'master'Phil Hughes2017-07-055-170/+133
|\ \ \ \ \ \
| * | | | | | Revert change to design. Go back to scrollable pageFilipa Lacerda2017-07-055-170/+133
|/ / / / / /
* | | | | | Merge branch 'gitaly-submodule-url-for' into 'master'Sean McGivern2017-07-052-5/+52
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Migrate #submodule_url_for to GitalyJacob Vosmaer2017-07-052-5/+52
| | |/ / / | |/| | |
* | | | | Merge branch 'update-raven-253' into 'master'Sean McGivern2017-07-052-3/+3
|\ \ \ \ \
| * | | | | Update sentry-raven from 2.4.0 to 2.5.3update-raven-253Gabriel Mazetto2017-07-032-3/+3
* | | | | | Merge branch 'dm-encode-tree-and-blob-paths' into 'master'Rémy Coutable2017-07-053-0/+13
|\ \ \ \ \ \
| * | | | | | Fix issues with non-UTF8 filenames by always fixing the encoding of tree and ...dm-encode-tree-and-blob-pathsDouwe Maan2017-07-043-0/+13
* | | | | | | Merge branch 'monitoring-dashboard-fine-tuning-ux' into 'master'Phil Hughes2017-07-054-10/+26
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Improve the overall UX for the new monitoring dashboardmonitoring-dashboard-fine-tuning-uxJose Ivan Vargas2017-07-044-10/+26
* | | | | | | Merge branch '34544_add_italian_translation_of_i18n' into 'master'34621-add-subgroups-limitations-to-pages-docsDouwe Maan2017-07-044-1/+1149
|\ \ \ \ \ \ \
| * | | | | | | fix the format of the translation string黄涛2017-07-031-4/+4
| * | | | | | | fix the format of the translation string黄涛2017-06-301-136/+137
| * | | | | | | add Italian translation to I18N黄涛2017-06-304-1/+1148
* | | | | | | | Merge branch 'dm-always-verify-source-branch-can-be-deleted' into 'master'Sean McGivern2017-07-043-13/+69
|\ \ \ \ \ \ \ \
| * | | | | | | | Prevent accidental deletion of protected MR source branch by repeating checks...dm-always-verify-source-branch-can-be-deletedDouwe Maan2017-07-043-13/+69
* | | | | | | | | Merge branch 'revert-2c879643' into 'master'Sean McGivern2017-07-045-4/+52
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Merge branch 'revert-12499' into 'master'"revert-2c879643Douwe Maan2017-07-045-4/+52
* | | | | | | | | | Merge branch 'bump-prometheus-version-to-fix-text-representation-problem' int...Grzegorz Bizon2017-07-041-2/+2
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'bump-prometheus-version-to-fix-text-representatio...bump-prometheus-version-to-fix-text-representation-problemPaweł Chojnacki2017-07-0447-229/+1174
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| * | | | | | | | | | Update prometheus client gemPawel Chojnacki2017-07-041-2/+2
* | | | | | | | | | | Merge branch 'dm-9-3-requires-mysql-trigger' into 'master'Sean McGivern2017-07-043-6/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Document that GitLab 9.3 requires the TRIGGER permission on MySQLdm-9-3-requires-mysql-triggerDouwe Maan2017-07-043-6/+15
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'feature/no-hypen-at-end-of-commit-ref-slug' into 'master'Rémy Coutable2017-07-044-10/+21
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | updated changelog entryStefan Hanreich2017-06-271-1/+1
| * | | | | | | | | | chaining the methods in ref_slugStefan Hanreich2017-06-241-3/+4
| * | | | | | | | | | fixed incorrect test case (for real), added another oneStefan Hanreich2017-06-191-1/+2
| * | | | | | | | | | fixed incorrect test caseStefan Hanreich2017-06-191-1/+1
| * | | | | | | | | | Merge branch 'feature/no-hypen-at-end-of-commit-ref-slug' of gitlab.com:lawli...Stefan Hanreich2017-06-180-0/+0
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | added additional test caseStefan Hanreich2017-06-181-0/+1
| | * | | | | | | | | | using bang method for gsubStefan Hanreich2017-05-111-2/+2
| | * | | | | | | | | | remove trailing commaStefan Hanreich2017-05-111-1/+1
| | * | | | | | | | | | fix typoStefan Hanreich2017-05-111-1/+1
| | * | | | | | | | | | removed superfluos testsStefan Hanreich2017-05-111-7/+1
| | * | | | | | | | | | updated regex to use beginning / ending of string metacharactersStefan Hanreich2017-05-111-1/+1
| | * | | | | | | | | | Merge branch 'feature/no-hypen-at-end-of-commit-ref-slug' of gitlab.com:lawli...Stefan Hanreich2017-05-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status