summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make sure there is a connection before using ActiveRecordbackup-database-timeout-fixJeroen Nijhof2016-02-081-0/+3
* 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
|\ \ \ \ \ \
| * | | | | | Changes sidebar widthfeature/jschatz1/sidebar-featuresJacob Schatz2016-02-051-2/+2
| * | | | | | Add `j` and `k` shortcutsJacob Schatz2016-02-052-2/+21
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'bug/jschatz1/sidebar-issues' into 'master' Dmitriy Zaporozhets2016-02-051-2/+4
|\ \ \ \ \ \
| * | | | | | Fix diff and commit view on merge requestsbug/jschatz1/sidebar-issuesJacob Schatz2016-02-041-2/+4
* | | | | | | Merge branch 'rrott/gitlab-ce-logo-issue-11867' into 'master'Robert Speicher2016-02-055-3/+24
|\ \ \ \ \ \ \
| * | | | | | | fixed issue with poor logo transition animation on safariRoman Rott2016-02-055-3/+24
* | | | | | | | Merge branch 'capitalize-placeholder' into 'master' Jacob Schatz2016-02-051-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Improve placeholder: search -> SearchDmitriy Zaporozhets2016-02-051-1/+1
|/ / / / / / /
* | | | | | | Add JS style changes.feature/jschatz1/issuable-date-positioningJacob Schatz2016-02-051-2/+4
* | | | | | | Edited time ago location change.Jacob Schatz2016-02-055-50/+62
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'missing_uploads_dir' into 'master' Achilleas Pipinellis2016-02-051-0/+3
|\ \ \ \ \ \
| * | | | | | Make sure the public/uploads/ directory is createdAchilleas Pipinellis2016-02-051-0/+3
* | | | | | | Merge branch 'fix-double-page' into 'master' Dmitriy Zaporozhets2016-02-053-3/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix double pagingJosh Frye2016-02-053-3/+1
* | | | | | | | Merge branch 'improve-broadcast-messages' into 'master' Dmitriy Zaporozhets2016-02-052-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Improve admin broadcast messages pageDmitriy Zaporozhets2016-02-052-2/+2
* | | | | | | | Merge branch 'ruby_sha' into 'master' Achilleas Pipinellis2016-02-052-1/+12
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add ruby version update info in doc_styleguideAchilleas Pipinellis2016-02-051-0/+11
| * | | | | | | Fix wrong Ruby SHA and replace with sha256sumAchilleas Pipinellis2016-02-051-1/+1
* | | | | | | | Merge branch 'paginate-dashboard-projects' into 'master' Dmitriy Zaporozhets2016-02-0515-33/+91
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Frontend changes from MR feedbackpaginate-dashboard-projectsJosh Frye2016-02-051-3/+4
| * | | | | | | Fix project filter form renderingDmitriy Zaporozhets2016-02-052-7/+11
| * | | | | | | Implement changes from MR feedbackJosh Frye2016-02-045-16/+16
| * | | | | | | Remove js lineJosh Frye2016-02-041-1/+0
| * | | | | | | Various filter fixesJosh Frye2016-02-0418-62/+90
| * | | | | | | Delay filter until user stops typingJosh Frye2016-02-046-26/+33