summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Restrict InlineJavaScript for haml_lint to dev and test environmentwinh-scope-haml-linterwinh2017-08-081-9/+11
* Merge branch 'fix-35786' into 'master'Rémy Coutable2017-08-071-1/+1
|\
| * Add a missing whitespace in "private forks you have no access to"Mehdi Lahmam2017-08-061-1/+1
* | Merge branch 'restrict-haml-javascript' into 'master'Tim Zallmann2017-08-074-0/+22
|\ \
| * | Add custom linter for inline JavaScript to haml_lint (!9742)winniehell2017-08-074-0/+22
* | | Merge branch 'docs-introduce-gitaly-ruby' into 'master'Sean McGivern2017-08-071-0/+352
|\ \ \
| * | | Change spelling of gitlab-shellJacob Vosmaer2017-08-071-1/+1
| * | | Add 9.5 update guide, with Gitaly specificsJacob Vosmaer2017-08-041-0/+352
* | | | Merge branch '32300__expose_more_attributes' into 'master'Rémy Coutable2017-08-074-17/+37
|\ \ \ \ | |_|/ / |/| | |
| * | | Expose more attributes to unauthenticated GET /projects/:idTony2017-08-034-17/+37
* | | | Merge branch 'translation_missing_items_to_i18n' into 'master'test-triggerRémy Coutable2017-08-0710-45/+91
|\ \ \ \
| * | | | Synchronous zanata community contribution translationHuang Tao2017-08-0710-45/+91
|/ / / /
* | | | Merge branch '35852_add_korean_translations_to_i18n' into 'master'Rémy Coutable2017-08-073-1/+1209
|\ \ \ \
| * | | | Add Korean translation to i18nHuang Tao2017-08-073-1/+1209
|/ / / /
* | | | Merge branch 'winh-upgrade-haml_lint' into 'master'Douwe Maan2017-08-074-6/+22
|\ \ \ \
| * | | | Upgrade haml_lint Gem to 0.26.0Winnie Hellmann2017-08-074-6/+22
|/ / / /
* | | | Merge branch 'mattermost_fixes' into 'master'Sean McGivern2017-08-073-9/+28
|\ \ \ \
| * | | | Fix Mattermost integrationmattermost_fixesValery Sizov2017-08-043-9/+28
* | | | | Merge branch 'docs/upgrades-for-background-migrations' into 'master'Sean McGivern2017-08-073-17/+75
|\ \ \ \ \
| * | | | | Mention schema migrations and patch releasesdocs/upgrades-for-background-migrationsYorick Peterse2017-08-041-0/+6
| * | | | | Removed commit guidelines for migrationsYorick Peterse2017-08-041-10/+3
| * | | | | Update the update guides for background migrationsYorick Peterse2017-08-042-9/+68
* | | | | | Merge branch 'gitaly-renames-annotations' into 'master'Sean McGivern2017-08-075-92/+12
|\ \ \ \ \ \
| * | | | | | Rename raw -> ruggedJacob Vosmaer2017-08-041-1/+1
| * | | | | | Migration link for Repository#logJacob Vosmaer2017-08-031-0/+1
| * | | | | | Remove unused methodsJacob Vosmaer2017-08-031-77/+0
| * | | | | | Remove unnecessary 'raw' aliasJacob Vosmaer2017-08-033-7/+1
| * | | | | | Rename 'commits_between' to 'rugged_commits_between'Jacob Vosmaer2017-08-033-7/+9
* | | | | | | Merge branch '33095-mr-widget-ui' into 'master'Phil Hughes2017-08-0755-898/+904
|\ \ \ \ \ \ \
| * | | | | | | clean up merge request widget UISimon Knox2017-08-0755-898/+904
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fix-pdf-dependencies' into 'master'Phil Hughes2017-08-0710-3454/+44
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix issues with pdf-js dependenciesMike Greiling2017-08-0710-3454/+44
|/ / / / / /
* | | | | | Merge branch 'ci-lint-fix' into 'master'Tim Zallmann2017-08-062-1/+4
|\ \ \ \ \ \
| * | | | | | Fix order of CI lint ace editor loadingci-lint-fixPhil Hughes2017-08-042-1/+4
* | | | | | | Merge branch '27616-fix-contributions-graph-utc-offset-mysql' into 'master'Tim Zallmann2017-08-068-15/+70
|\ \ \ \ \ \ \
| * | | | | | | add CHANGELOG.md for !1320827616-fix-contributions-graph-utc-offset-mysqlMike Greiling2017-07-311-0/+4
| * | | | | | | adjust user contribution calendar time formattingMike Greiling2017-07-311-3/+3
| * | | | | | | fix rubocop violations 👮Mike Greiling2017-07-311-4/+4
| * | | | | | | fix mysql syntax for date INTERVAL arithmaticMike Greiling2017-07-311-3/+7
| * | | | | | | add tests for proper timezone date grouping within ContributionsCalendarMike Greiling2017-07-311-4/+34
| * | | | | | | adjust timezone for date grouping in contributions calendarMike Greiling2017-07-291-2/+4
| * | | | | | | use timezone-aware Date.current instead of Date.today in ContributionsCalenda...Mike Greiling2017-07-291-2/+2
| * | | | | | | display system timezone underneath activity calendarMike Greiling2017-07-282-0/+6
| * | | | | | | ensure user profile calendar is generated based on server timezone, not local...Mike Greiling2017-07-283-4/+13
* | | | | | | | Merge branch 'docs-fix-missing-changelog-entries' into 'master'Mike Greiling2017-08-041-2/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | fix missing changelog entries for security release on 2017-01-23Mike Greiling2017-08-041-2/+24
* | | | | | | | | Merge branch 'fix/sm/34547-cannot-connect-to-ci-server-error-messages' into '...Sean McGivern2017-08-043-28/+81
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix specfix/sm/34547-cannot-connect-to-ci-server-error-messagesShinya Maeda2017-08-041-2/+2
| * | | | | | | | | Fix specShinya Maeda2017-08-041-1/+3
| * | | | | | | | | Add a spec for concurrent processShinya Maeda2017-08-041-27/+68