summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'highlighted-note' into 'master'Jacob Schatz2016-02-247-9/+9
* Merge branch 'fix-moving-revert-button' into 'master'Jacob Schatz2016-02-241-2/+2
* Merge branch 'bugfix/jschatz1/missing-project-button' into 'master'Rémy Coutable2016-02-243-9/+10
* Merge branch 'issue-sidebar-content-scrolling' into 'master'Jacob Schatz2016-02-241-28/+23
* Merge branch 'hudecof/show-crowd-login-form-when-signin-disabled' into 'master'Robert Speicher2016-02-241-1/+1
* Merge branch 'fix-todos' into 'master'Robert Speicher2016-02-242-2/+2
* Merge branch 'dz-small-ui-fixes' into 'master'Jacob Schatz2016-02-2319-88/+90
* Merge branch 'milestone-drag-empty-list' into 'master'Jacob Schatz2016-02-231-9/+21
* Merge branch 'fix/13631-error-with-merged-mr' into 'master' Rémy Coutable2016-02-231-1/+1
* Merge branch 'issue_13463' into 'master' Jacob Schatz2016-02-233-1/+10
* Merge branch 'fix-failing-issue-tests' into 'master' Rémy Coutable2016-02-232-13/+3
* Merge branch 'fix-zero-votes-showing-on-issue-list' into 'master' Rémy Coutable2016-02-222-11/+3
* Merge branch 'tasks' into 'master' Douglas Barbosa Alexandre2016-02-2224-14/+754
* Merge branch 'merge-when-succeeded' into 'master' Douwe Maan2016-02-223-15/+25
* Merge branch 'award-emoji-retina' into 'master' Jacob Schatz2016-02-213-0/+10
* Merge branch 'flush-cache-web-editor' into 'master' Douwe Maan2016-02-211-0/+4
* Merge branch 'visibletrap/gitlab-ce-label'Douwe Maan2016-02-2115-17/+60
* Merge branch '12792-emoji-as-text-diff-comment'Douwe Maan2016-02-212-3/+4
* Merge branch 'issue_3276' into 'master' Jacob Schatz2016-02-199-45/+147
* Merge branch 'commit-status-fix' into 'master' Kamil Trzciński2016-02-192-4/+4
* Merge branch 'issue_3409' into 'master' Robert Speicher2016-02-1918-30/+321
* Merge branch 'bugfix/jschatz1/issuable-consistency' into 'master' Rémy Coutable2016-02-191-1/+1
* Merge branch 'ci/remove-builds' into 'master' Grzegorz Bizon2016-02-193-27/+92
* Merge branch 'axil/gitlab-ce-mention-project-in-fork-notice' into 'master' Rémy Coutable2016-02-191-1/+1
* Merge branch 'saml-decoupling' into 'master'Patricio Cano2016-02-191-18/+36
* Merge branch 'ci/api-runners' into 'master' Kamil Trzciński2016-02-191-0/+6
* Merge branch 'issue_11872' into 'master' Jacob Schatz2016-02-192-17/+13
* Merge branch '12791-hide-project-limit-reached-warning' into 'master' Douwe Maan2016-02-191-1/+1
* Merge branch 'rs-emoji' into 'master' Douwe Maan2016-02-194-1276/+1724
* Merge branch 'fix/project-forks-page' into 'master' Douwe Maan2016-02-191-1/+1
* Merge branch 'rs-show-owner-label' into 'master' Douwe Maan2016-02-191-1/+1
* Merge branch 'autocrlf-lazy' into 'master' Robert Speicher2016-02-191-9/+14
* Merge branch 'bugfix/jschatz1/sidebar-fixes/02-18-16' into 'master' Dmitriy Zaporozhets2016-02-182-16/+2
* Merge branch 'fix/gitpushservice-complexity-issue' into 'master' Douwe Maan2016-02-182-58/+62
* Merge branch 'fix/ci-first-job-allow-failure' into 'master' Kamil Trzciński2016-02-181-0/+1
* Merge branch 'rs-git-fetch-labels' into 'master' Kamil Trzciński2016-02-181-2/+2
* Merge branch 'issue_13539' into 'master' Robert Speicher2016-02-181-1/+1
* Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master' Douwe Maan2016-02-187-3/+88
* Merge branch 'bugfix/jschatz1/milestone-icon' into 'master' Rémy Coutable2016-02-171-1/+1
|\
| * Correct icon for milestones.bugfix/jschatz1/milestone-iconJacob Schatz2016-02-171-1/+1
* | Merge branch 'fix/13464-order-line-notes-create_at-in-parallel-diff-view' int...Douwe Maan2016-02-171-1/+1
|\ \
| * | Sort line notes used in parallel diff by created_atRémy Coutable2016-02-171-1/+1
* | | Merge branch 'fix/13367-redirect-to-project-page-if-no-import' into 'master' Douwe Maan2016-02-172-3/+13
|\ \ \ | |/ / |/| |
| * | Redirect /import to project page if no importing at all and repo existsfix/13367-redirect-to-project-page-if-no-importRémy Coutable2016-02-172-3/+13
| |/
* | Merge branch 'expire-fork-import-caches' into 'master' Douwe Maan2016-02-174-1/+32
|\ \
| * | Flush all repository caches when deleting a repoexpire-fork-import-cachesYorick Peterse2016-02-172-1/+22
| * | Expire caches after forking/importing a repositoryYorick Peterse2016-02-173-0/+10
* | | Merge branch 'image-diff' into 'master' Douwe Maan2016-02-173-11/+18
|\ \ \
| * | | Fixes requested by Rémyimage-diffJacob Vosmaer2016-02-172-4/+5
| * | | No use to sanitize partial blob dataJacob Vosmaer2016-02-171-1/+1