Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add Korean translation to i18n | Huang Tao | 2017-08-07 | 3 | -1/+1209 |
| | |||||
* | Merge branch 'winh-upgrade-haml_lint' into 'master' | Douwe Maan | 2017-08-07 | 4 | -6/+22 |
|\ | | | | | | | | | Upgrade haml_lint Gem to 0.26.0 See merge request !13304 | ||||
| * | Upgrade haml_lint Gem to 0.26.0 | Winnie Hellmann | 2017-08-07 | 4 | -6/+22 |
|/ | |||||
* | Merge branch 'mattermost_fixes' into 'master' | Sean McGivern | 2017-08-07 | 3 | -9/+28 |
|\ | | | | | | | | | Fix Mattermost integration See merge request !13305 | ||||
| * | Fix Mattermost integrationmattermost_fixes | Valery Sizov | 2017-08-04 | 3 | -9/+28 |
| | | |||||
* | | Merge branch 'docs/upgrades-for-background-migrations' into 'master' | Sean McGivern | 2017-08-07 | 3 | -17/+75 |
|\ \ | | | | | | | | | | | | | Update the guides for updating GitLab and adding background migrations See merge request !13284 | ||||
| * | | Mention schema migrations and patch releasesdocs/upgrades-for-background-migrations | Yorick Peterse | 2017-08-04 | 1 | -0/+6 |
| | | | |||||
| * | | Removed commit guidelines for migrations | Yorick Peterse | 2017-08-04 | 1 | -10/+3 |
| | | | | | | | | | | | | | | | At some point we decided this isn't really necessary, so let's get rid of it. | ||||
| * | | Update the update guides for background migrations | Yorick Peterse | 2017-08-04 | 2 | -9/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | The introduction of background migrations means some of our requirements for online upgrades have to be adjusted / clarified. See https://gitlab.com/gitlab-org/gitlab-ce/issues/35939 for more information. | ||||
* | | | Merge branch 'gitaly-renames-annotations' into 'master' | Sean McGivern | 2017-08-07 | 5 | -92/+12 |
|\ \ \ | | | | | | | | | | | | | | | | | Gitaly deletions and annotations See merge request !13280 | ||||
| * | | | Rename raw -> rugged | Jacob Vosmaer | 2017-08-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Migration link for Repository#log | Jacob Vosmaer | 2017-08-03 | 1 | -0/+1 |
| | | | | |||||
| * | | | Remove unused methods | Jacob Vosmaer | 2017-08-03 | 1 | -77/+0 |
| | | | | |||||
| * | | | Remove unnecessary 'raw' alias | Jacob Vosmaer | 2017-08-03 | 3 | -7/+1 |
| | | | | |||||
| * | | | Rename 'commits_between' to 'rugged_commits_between' | Jacob Vosmaer | 2017-08-03 | 3 | -7/+9 |
| | | | | |||||
* | | | | Merge branch '33095-mr-widget-ui' into 'master' | Phil Hughes | 2017-08-07 | 55 | -898/+904 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Request widget Improvements Closes #33095 See merge request !12601 | ||||
| * | | | | clean up merge request widget UI | Simon Knox | 2017-08-07 | 55 | -898/+904 |
| | | | | | |||||
* | | | | | Merge branch 'fix-pdf-dependencies' into 'master' | Phil Hughes | 2017-08-07 | 10 | -3454/+44 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | Fix issues with pdf-js dependencies See merge request !13328 | ||||
| * | | | | Fix issues with pdf-js dependencies | Mike Greiling | 2017-08-07 | 10 | -3454/+44 |
|/ / / / | |||||
* | | | | Merge branch 'ci-lint-fix' into 'master' | Tim Zallmann | 2017-08-06 | 2 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix order of CI lint ace editor loading Closes #35985 See merge request !13316 | ||||
| * | | | | Fix order of CI lint ace editor loadingci-lint-fix | Phil Hughes | 2017-08-04 | 2 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | Closes #35985 | ||||
* | | | | | Merge branch '27616-fix-contributions-graph-utc-offset-mysql' into 'master' | Tim Zallmann | 2017-08-06 | 8 | -15/+70 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Timezone Inconsistencies in User Contribution Calendar Closes #27616 and #1943 See merge request !13208 | ||||
| * | | | | | add CHANGELOG.md for !1320827616-fix-contributions-graph-utc-offset-mysql | Mike Greiling | 2017-07-31 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | adjust user contribution calendar time formatting | Mike Greiling | 2017-07-31 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | fix rubocop violations 👮 | Mike Greiling | 2017-07-31 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | fix mysql syntax for date INTERVAL arithmatic | Mike Greiling | 2017-07-31 | 1 | -3/+7 |
| | | | | | | |||||
| * | | | | | add tests for proper timezone date grouping within ContributionsCalendar | Mike Greiling | 2017-07-31 | 1 | -4/+34 |
| | | | | | | |||||
| * | | | | | adjust timezone for date grouping in contributions calendar | Mike Greiling | 2017-07-29 | 1 | -2/+4 |
| | | | | | | |||||
| * | | | | | use timezone-aware Date.current instead of Date.today in ↵ | Mike Greiling | 2017-07-29 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | ContributionsCalendar class | ||||
| * | | | | | display system timezone underneath activity calendar | Mike Greiling | 2017-07-28 | 2 | -0/+6 |
| | | | | | | |||||
| * | | | | | ensure user profile calendar is generated based on server timezone, not ↵ | Mike Greiling | 2017-07-28 | 3 | -4/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | local timezone | ||||
* | | | | | | Merge branch 'docs-fix-missing-changelog-entries' into 'master' | Mike Greiling | 2017-08-04 | 1 | -2/+24 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing CHANGELOG.md entries for security release on 2017-01-23 See merge request !13327 | ||||
| * | | | | | | fix missing changelog entries for security release on 2017-01-23 | Mike Greiling | 2017-08-04 | 1 | -2/+24 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'fix/sm/34547-cannot-connect-to-ci-server-error-messages' into ↵ | Sean McGivern | 2017-08-04 | 3 | -28/+81 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix "Cannot connect to CI server error messages" Closes #34547 See merge request !13252 | ||||
| * | | | | | | | Fix specfix/sm/34547-cannot-connect-to-ci-server-error-messages | Shinya Maeda | 2017-08-04 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Fix spec | Shinya Maeda | 2017-08-04 | 1 | -1/+3 |
| | | | | | | | | |||||
| * | | | | | | | Add a spec for concurrent process | Shinya Maeda | 2017-08-04 | 1 | -27/+68 |
| | | | | | | | | |||||
| * | | | | | | | Add changelog | Shinya Maeda | 2017-08-04 | 1 | -0/+5 |
| | | | | | | | | |||||
| * | | | | | | | essential | Shinya Maeda | 2017-08-04 | 1 | -1/+6 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch ↵ | Sean McGivern | 2017-08-04 | 3 | -1/+24 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/35931-active-ci-pipelineschedule-have-nullified-next_run_at' into 'master' Fix "pipeline_schedules pages throwing error 500" when "Active Ci::PipelineSchedule have a nullified `next_run_at`" Closes #32790 See merge request !13286 | ||||
| * | | | | | | | | Fix specfix/sm/35931-active-ci-pipelineschedule-have-nullified-next_run_at | Shinya Maeda | 2017-08-04 | 1 | -7/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Add changelog | Shinya Maeda | 2017-08-04 | 1 | -0/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | fix | Shinya Maeda | 2017-08-04 | 2 | -1/+24 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch '35275-change-issue-icon' into 'master'feature/migrate-last-commit-for-path-to-gitaly | Phil Hughes | 2017-08-04 | 5 | -5/+13 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update top bar issues icon Closes #35275 See merge request !13263 | ||||
| * | | | | | | | | Update top bar issues icon | Annabel Dunstone Gray | 2017-08-04 | 5 | -5/+13 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'fix-pipeline-icon-contextual-nav' into 'master' | Annabel Dunstone Gray | 2017-08-04 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipeline icon in contextual nav for projects See merge request !13324 | ||||
| * | | | | | | | | Fix pipeline icon in contextual nav for projects | tauriedavis | 2017-08-04 | 1 | -2/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '34060-simplified-general-project-settings' into 'master' | Mike Greiling | 2017-08-04 | 10 | -239/+293 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 34060 Simply general project settings to use expanded panels Closes #34060 See merge request !12620 | ||||
| * | | | | | | | | fixed up specs | Phil Hughes | 2017-07-28 | 4 | -55/+71 |
| | | | | | | | | | |||||
| * | | | | | | | | trying to fix tests | tauriedavis | 2017-07-28 | 2 | -3/+14 |
| | | | | | | | | |