summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add Changelog entry for new maximum attachment size validatorfix/max-attachment-size-setting-validationGrzegorz Bizon2016-02-091-0/+1
* Validate maximum attachment size in application settingsGrzegorz Bizon2016-02-092-0/+12
* Merge branch 'increase_import_timeout' into 'master' Douwe Maan2016-02-093-2/+3
|\
| * Increase project import timeout from 4 minutes to 15 minutesDrew Blessing2016-02-043-2/+3
* | Merge branch 'fix/atom-url-issue' into 'master' Douwe Maan2016-02-091-1/+1
|\ \
| * | remove unnecessary lower function on SQLJames Lopez2016-02-041-1/+1
* | | update changelogValery Sizov2016-02-091-1/+1
* | | Merge branch 'snippet_search_refactoring'Valery Sizov2016-02-094-30/+31
|\ \ \
| * | | trigger buildssnippet_search_refactoringValery Sizov2016-02-050-0/+0
| * | | one more improvement to snippet searchValery Sizov2016-02-051-1/+1
| * | | Faster snippet searchValery Sizov2016-02-054-29/+30
* | | | Merge branch 'caching-repository-git-operations' into 'master' Yorick Peterse2016-02-096-6/+140
|\ \ \ \
| * | | | Cache various Repository Git operationscaching-repository-git-operationsYorick Peterse2016-02-086-6/+140
* | | | | Merge branch 'ci/improve-ci-build-api' into 'master' Kamil Trzciński2016-02-092-93/+55
|\ \ \ \ \
| * | | | | Extract shared context level up in build specsci/improve-ci-build-apiGrzegorz Bizon2016-02-041-56/+17
| * | | | | Remove unmaintainable db schema comment from build factoryGrzegorz Bizon2016-02-041-27/+0
| * | | | | Improve CI API specs related to operations on buildGrzegorz Bizon2016-02-042-21/+49
* | | | | | Merge branch 'backup-database-timeout-fix' into 'master' Robert Speicher2016-02-081-0/+3
|\ \ \ \ \ \
| * | | | | | Make sure there is a connection before using ActiveRecordbackup-database-timeout-fixJeroen Nijhof2016-02-081-0/+3
* | | | | | | Merge branch 'huacnlee/current-settings-autoload-bug-in-development' into 'ma...Robert Speicher2016-02-081-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix CurrentSettings autoload bug in development.huacnlee/current-settings-autoload-bug-in-developmentJason Lee2016-02-081-2/+2
| |/ / / / / /
* | | | | | | Merge branch 'master' into 'master' Robert Schilling2016-02-081-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix grammar in installation requirements.Paul Johnson2016-02-081-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'fix-init' into 'master' Rémy Coutable2016-02-082-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Fixed init.d script not working on OS Xritave2016-02-082-1/+2
* | | | | | | | Merge branch 'issues_12693' into 'master' Jacob Vosmaer2016-02-081-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | suppress only errors in init-script while determining canonical path of gitla...Harald Spaethe2016-02-081-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'kkm/gitlab-ce-user-diff-view-pref-cookie' into 'master' Rémy Coutable2016-02-085-1/+37
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add spec for assigning view param from cookiekkm/gitlab-ce-user-diff-view-pref-cookieRobert Speicher2016-02-051-5/+19
| * | | | | | Update CHANGELOGRobert Speicher2016-02-051-1/+1
| * | | | | | Add a controller test for the new 'diff_view' cookieRémy Coutable2016-02-052-4/+14
| * | | | | | Remember user's inline/tabular diff view preference in a cookiekkm2016-02-054-0/+12
* | | | | | | Merge branch 'contributing' into 'master' Achilleas Pipinellis2016-02-081-45/+59
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Rearrange some sections in CONTRIBUTING.mdAchilleas Pipinellis2016-02-081-45/+59
|/ / / / / /
* | | | | | Merge branch 'contributing_toc' into 'master' Achilleas Pipinellis2016-02-081-0/+26
|\ \ \ \ \ \
| * | | | | | Add table of contents in CONTRIBUTING.mdAchilleas Pipinellis2016-02-081-0/+26
|/ / / / / /
* | | | | | Merge branch 'jira_when_ce' into 'master' Achilleas Pipinellis2016-02-071-0/+9
|\ \ \ \ \ \
| * | | | | | Clarify when JIRA service was backported to CEAchilleas Pipinellis2016-02-081-0/+9
* | | | | | | Update CHANGELOGRobert Speicher2016-02-071-0/+3
* | | | | | | Merge branch 'markdown_help' into 'master' Achilleas Pipinellis2016-02-071-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Change logo image name in markdown documentationAchilleas Pipinellis2016-02-071-4/+4
| |/ / / / / /
* | | | | | | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-02-061-2/+19
|\ \ \ \ \ \ \
| * | | | | | | Fixed Window's commands for SSH Help.Aaron Power2016-02-061-2/+19
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'project-title-dropdown-toggle-button' into 'master' Jacob Schatz2016-02-053-4/+13
|\ \ \ \ \ \ \
| * | | | | | | Project dropdown test span -> iPhil Hughes2016-02-051-1/+1
| * | | | | | | Uses icon helper for dropdown toggle iconPhil Hughes2016-02-051-1/+1
| * | | | | | | Changed the project switcher dropdown togglePhil Hughes2016-02-053-4/+13
* | | | | | | | Merge branch 'improve-diverging-commit-counts' into 'master' Robert Speicher2016-02-053-5/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Dedicated method for counting commits between refsimprove-diverging-commit-countsYorick Peterse2016-02-043-5/+8
* | | | | | | | | Merge branch 'feature/jschatz1/sidebar-features' into 'master' Dmitriy Zaporozhets2016-02-053-4/+23
|\ \ \ \ \ \ \ \ \