summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-arc...Jacob Vosmaer2016-02-17181-981/+1795
|\
| * 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-163-11/+17
| |\ \
| | * | 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-112-10/+16
| * | | Merge branch 'fix/13356-issuable-index-of-total-in-sidebar' into 'master' Douwe Maan2016-02-164-94/+46
| |\ \ \
| | * | | 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-155-95/+61
| * | | | 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-161-5/+14
| |\ \ \ \
| | * | | | updated system note service and spec based on feedbackJames Lopez2016-02-161-1/+3
| | * | | | woo hoo - getting there with the cross-reference issue. Should fix the proble...James Lopez2016-02-121-4/+11
| | * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/cross-refer...James Lopez2016-02-1220-77/+86
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/cross-refer...James Lopez2016-02-1091-432/+647
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/cross-refer...James Lopez2016-02-0534-190/+531
| | |\ \ \ \ \ \
| | * | | | | | | WIP - fix and spec for cross reference issue with forksJames Lopez2016-02-041-2/+2
| * | | | | | | | Merge branch 'rs-issue-13467' into 'master' Douwe Maan2016-02-161-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Ensure Commit#show responds 404 instead of 500 when given an invalid IDrs-issue-13467Robert Speicher2016-02-151-2/+2
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | 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
| |/ / / / / / /
| * | | | | | | Merge branch 'fix-me-me-me-me' into 'master' Valery Sizov2016-02-151-1/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Fix duplicate "me" in tooltip of the "thumbsup" awards EmojiStan Hu2016-02-131-1/+2
| * | | | | | | | Merge branch 'fix/ci-emails-broken-link' into 'master' Douwe Maan2016-02-133-8/+10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix broken link in CI build notification emailsGrzegorz Bizon2016-02-123-8/+10
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge branch 'ben.boeckel/gitlab-ce-fixup-links-in-generic-docs' into 'master' Douwe Maan2016-02-132-2/+16
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Fix relative links in other markup formatsben.boeckel/gitlab-ce-fixup-links-in-generic-docsBen Boeckel2016-02-122-2/+16
| | |/ / / / / /
| * | | | | | | Merge branch 'fix-duplicate-hook-notifications' into 'master' Douwe Maan2016-02-122-10/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Fix duplicated branch creation/deletion Web hooks/service notifications when ...Stan Hu2016-02-092-10/+2
| * | | | | | | | Merge branch 'fix_500-commit-null' into 'master' Douwe Maan2016-02-121-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Don't try to mark broken MR as mergableNemanja Boric2016-02-111-1/+1
| * | | | | | | | | Merge branch 'rs-issue-merge-requests' into 'master' Douwe Maan2016-02-121-3/+3
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Correct indentation for `issues/merge_requests` partial renderrs-issue-merge-requestsRobert Speicher2016-02-111-3/+3
| * | | | | | | | | Merge branch 'olirogers/gitlab-ce-project-milestone-order' into 'master' Douwe Maan2016-02-123-12/+9
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix milestone order in project and issue edit lists to due_dateolirogers/gitlab-ce-project-milestone-orderOliver Rogers2016-02-103-12/+9
| | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'streamline-email-validation' into 'master' Douwe Maan2016-02-125-23/+6
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Re-add EmailValidator to avoid the repetition of format: { with: Devise.email...streamline-email-validationRémy Coutable2016-02-095-6/+10
| | * | | | | | | | | Validate email addresses using Devise.email_regexpRémy Coutable2016-02-095-28/+7
| * | | | | | | | | | Don't show fork button if user can't fork the project.issue_13369Rubén Dávila2016-02-111-8/+9
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Move builds badge implementation to new badges controllerGrzegorz Bizon2016-02-112-10/+11
| * | | | | | | | | Inherit build badge access permissions from projectGrzegorz Bizon2016-02-111-10/+4
| * | | | | | | | | Respond to proper format for build badge requestGrzegorz Bizon2016-02-111-2/+8
| * | | | | | | | | Move badge implementation to builds controllerGrzegorz Bizon2016-02-112-16/+10
View Lorry Controller Status