summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix HAML lint errorszj-project-templatesZ.J. van de Weg2017-08-071-4/+3
* Fix last feature test for project templatesZ.J. van de Weg2017-08-073-4/+4
* After merge cleanupZ.J. van de Weg2017-08-079-22/+36
* Fixes race condition in project uploadsTiago Botelho2017-08-073-5/+7
* Fix eslint errorFilipa Lacerda2017-08-071-1/+0
* Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-071990-14974/+19801
|\
| * 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
| | * | | | Add changelogShinya Maeda2017-08-041-0/+5
| | * | | | essentialShinya Maeda2017-08-041-1/+6
| * | | | | Merge branch 'fix/sm/35931-active-ci-pipelineschedule-have-nullified-next_run...Sean McGivern2017-08-043-1/+24
| |\ \ \ \ \
| | * | | | | Fix specfix/sm/35931-active-ci-pipelineschedule-have-nullified-next_run_atShinya Maeda2017-08-041-7/+3
| | * | | | | Add changelogShinya Maeda2017-08-041-0/+4
| | * | | | | fixShinya Maeda2017-08-042-1/+24
| | |/ / / /
| * | | | | Merge branch '35275-change-issue-icon' into 'master'feature/migrate-last-commit-for-path-to-gitalyPhil Hughes2017-08-045-5/+13
| |\ \ \ \ \
| | * | | | | Update top bar issues iconAnnabel Dunstone Gray2017-08-045-5/+13
| |/ / / / /
| * | | | | Merge branch 'fix-pipeline-icon-contextual-nav' into 'master'Annabel Dunstone Gray2017-08-041-2/+2
| |\ \ \ \ \
| | * | | | | Fix pipeline icon in contextual nav for projectstauriedavis2017-08-041-2/+2
| * | | | | | Merge branch '34060-simplified-general-project-settings' into 'master'Mike Greiling2017-08-0410-239/+293
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | fixed up specsPhil Hughes2017-07-284-55/+71
| | * | | | | trying to fix teststauriedavis2017-07-282-3/+14
| | * | | | | fix merge conflictstauriedavis2017-07-281-215/+215
| | * | | | | css fixestauriedavis2017-07-282-58/+63
| | * | | | | try and fix some teststauriedavis2017-07-283-6/+16
| | * | | | | 34060 Simply general project settings to use expanded panelstauriedavis2017-07-285-190/+202
| * | | | | | Merge branch 'do-not-test-mysql-in-ee-non-master-or-stable' into 'master'Rémy Coutable2017-08-041-5/+7
| |\ \ \ \ \ \
| | * | | | | | Since mysql is not a priority anymore, test it lessdo-not-test-mysql-in-ee-non-master-or-stableLin Jen-Shin2017-08-041-5/+7
| * | | | | | | Merge branch 'source-install-yarn-2' into 'master'Mike Greiling2017-08-046-7/+24
| |\ \ \ \ \ \ \
| | * | | | | | | Install yarn via apt in update guidesJacob Vosmaer2017-08-045-5/+20
| | * | | | | | | Use long curl optionsJacob Vosmaer2017-08-041-1/+1
| | * | | | | | | Install 'yarn' globally to avoid PATH issuesJacob Vosmaer2017-08-031-2/+4
| * | | | | | | | Merge branch 'winh-new-dropdown-dividers' into 'master'Annabel Dunstone Gray2017-08-042-0/+8
| |\ \ \ \ \ \ \ \