summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Initialize navigation shortcuts on project's files pagefeature/jschatz1/sidebar-sizingAlfredo Sumaran2016-02-232-0/+2
* Fix failing specAlfredo Sumaran2016-02-231-1/+0
* Set window_size to 1366*768Alfredo Sumaran2016-02-232-2/+2
* Ability to toggle sidebar on smaller screensAlfredo Sumaran2016-02-233-20/+12
* Fixes padding when right sidebar is not presentAlfredo Sumaran2016-02-231-0/+11
* Update scrollbars after toggle sidebarAlfredo Sumaran2016-02-231-0/+6
* Sidebar overlaps content when screen is below 1200px.Jacob Schatz2016-02-163-67/+22
* Merge branch 'bugfix/jschatz1/sidebar-fixes-13215' into 'master' Jacob Schatz2016-02-162-1/+26
|\
| * Make copy button in collapsed sidebar work.bugfix/jschatz1/sidebar-fixes-13215Jacob Schatz2016-02-052-1/+14
| * Fix span margin issuesJacob Schatz2016-02-051-1/+5
| * Add hover for gutter toggle buttonJacob Schatz2016-02-051-5/+8
| * Change hover color of sidebar buttonsJacob Schatz2016-02-051-0/+5
| * Fix ugly state of dropdownJacob Schatz2016-02-051-1/+1
* | Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master' Douwe Maan2016-02-1612-98/+309
|\ \
| * | Use project.web_url instead deprecated repository.homepage in PushoverServiceRémy Coutable2016-02-161-1/+1
| * | Add new data to project in push, issue, merge-request and note webhooks databugagazavr/gitlab-ce-extend-hooksKirill Zaitsev2016-02-1111-97/+308
* | | Merge branch 'fix/13356-issuable-index-of-total-in-sidebar' into 'master' Douwe Maan2016-02-168-95/+84
|\ \ \
| * | | Display "iid of max_iid" in Issuables' sidebarRémy Coutable2016-02-163-19/+5
| * | | Fix the "x of y" displayed at the top of Issuables' sidebarfix/13356-issuable-index-of-total-in-sidebarRémy Coutable2016-02-159-96/+99
* | | | Merge branch 'cleanup-repository-initialize' into 'master' Douwe Maan2016-02-163-3/+3
|\ \ \ \
| * | | | Cleaned up Repository#initializecleanup-repository-initializeYorick Peterse2016-02-163-3/+3
* | | | | Merge branch 'fix/13458-eager-load-blob-data' into 'master' Douwe Maan2016-02-161-0/+2
|\ \ \ \ \
| * | | | | Eager-load image blob data in diffsfix/13458-eager-load-blob-dataRémy Coutable2016-02-161-0/+2
| |/ / / /
* | | | | Merge branch 'fix/cross-reference-notes-forks' into 'master' Douwe Maan2016-02-163-5/+30
|\ \ \ \ \
| * | | | | updated system note service and spec based on feedbackJames Lopez2016-02-162-5/+3
| * | | | | fix rubocop warningJames Lopez2016-02-121-2/+4
| * | | | | woo hoo - getting there with the cross-reference issue. Should fix the proble...James Lopez2016-02-122-8/+17
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/cross-refer...James Lopez2016-02-1252-213/+622
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/cross-refer...James Lopez2016-02-10155-759/+1952
| |\ \ \ \ \ \
| * | | | | | | update changelogJames Lopez2016-02-081-0/+1
| * | | | | | | fixed spec - at last!James Lopez2016-02-051-3/+2
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/cross-refer...James Lopez2016-02-0547-245/+733
| |\ \ \ \ \ \ \
| * | | | | | | | WIP - fix and spec for cross reference issue with forksJames Lopez2016-02-042-2/+18
* | | | | | | | | Merge branch 'rs-issue-13467' into 'master' Douwe Maan2016-02-162-2/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ensure Commit#show responds 404 instead of 500 when given an invalid IDrs-issue-13467Robert Speicher2016-02-152-2/+39
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs-git_not_found' into 'master' Douwe Maan2016-02-161-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Provide explicit html format when rendering git_not_found pagers-git_not_foundRobert Speicher2016-02-151-1/+1
| * | | | | | | | Properly render the `errors/git_not_found` pageRobert Speicher2016-02-151-1/+1
| |/ / / / / / /
* | | | | | | | Updates to git flow documentation.Sytse Sijbrandij2016-02-151-5/+6
* | | | | | | | Merge branch 'rs-gitlab-database-module' into 'master' Robert Speicher2016-02-152-6/+34
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix undefined method `postgresql?` during migrationrs-gitlab-database-moduleRobert Speicher2016-02-152-6/+34
|/ / / / / / /
* | | | | | | Merge branch 'offline-migration-docs' into 'master' Douwe Maan2016-02-151-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Add notice about offline migrationsoffline-migration-docsKamil Trzciński2015-11-021-1/+5
* | | | | | | | Merge branch 'fix-me-me-me-me' into 'master' Valery Sizov2016-02-154-2/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | Add spinach tests for award emojifix-me-me-me-meStan Hu2016-02-132-1/+36
| * | | | | | | | Fix duplicate "me" in tooltip of the "thumbsup" awards EmojiStan Hu2016-02-132-1/+3
* | | | | | | | | Merge branch 'update-omniauth-1-3-1' into 'master' Robert Speicher2016-02-132-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update omniauth to 1.3.1 for memory performanceTakuya Noguchi2016-02-132-4/+4
* | | | | | | | | | Merge branch 'fix/ci-emails-broken-link' into 'master' Douwe Maan2016-02-138-279/+302
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move profile notifications specs to separate filefix/ci-emails-broken-linkGrzegorz Bizon2016-02-122-98/+107
View Lorry Controller Status