summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Decouple SAML authentication from the default Omniauth logicPatricio Cano2016-02-181-18/+36
* Revert "Merge branch 'saml-decoupling' into 'master' "Douwe Maan2016-02-181-36/+18
* Merge branch 'saml-decoupling' into 'master' Robert Speicher2016-02-181-18/+36
|\
| * Decouple SAML authentication from the default Omniauth logicPatricio Cano2016-02-181-18/+36
* | Merge branch 'autocrlf-lazy' into 'master' Robert Speicher2016-02-181-9/+14
|\ \ | |/ |/|
| * Handle raw_repository returning nil in exists?autocrlf-lazyYorick Peterse2016-02-181-0/+2
| * Use Repository#exists? in Repository#commit?Yorick Peterse2016-02-181-1/+1
| * Fixed Repository#exists? to handle errorsYorick Peterse2016-02-181-6/+5
| * Only set autocrlf when creating/updating filesYorick Peterse2016-02-181-3/+7
* | Uses cross browser niceScroll to do scrolling on sidebar.Jacob Schatz2016-02-182-16/+2
* | Merge branch 'fix/ci-first-job-allow-failure' into 'master' Kamil Trzciński2016-02-181-0/+1
|\ \
| * | Return a builds array in builds create serviceGrzegorz Bizon2016-02-181-0/+1
* | | Merge branch 'rs-git-fetch-labels' into 'master' Kamil Trzciński2016-02-181-2/+2
|\ \ \ | |_|/ |/| |
| * | Fix labels for git clone/git fetch Project CI settingrs-git-fetch-labelsRobert Speicher2016-02-161-2/+2
* | | Merge branch 'fix/gitpushservice-complexity-issue' into 'master' Douwe Maan2016-02-182-58/+62
|\ \ \ | |_|/ |/| |
| * | refactored some stuff based on MR feedbackJames Lopez2016-02-172-9/+4
| * | refactored GitPushService and updated specJames Lopez2016-02-152-29/+25
| * | typoJames Lopez2016-02-121-1/+1
| * | attempt to reduce code complexity on GitPushService#executeJames Lopez2016-02-112-54/+67
* | | Reopened MRs should also be considered as open.issue_13539Rubén Dávila2016-02-171-1/+1
* | | Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master' Douwe Maan2016-02-177-3/+88
|\ \ \
| * | | Add ability to see and sort on vote count from Issues and MR listssee-and-sort-on-vote-count-mr-issuesDouglas Barbosa Alexandre2016-02-177-3/+88
* | | | Merge branch 'git-archive-refactor' into 'master' Douwe Maan2016-02-172-24/+3
|\ \ \ \
| * \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-arc...git-archive-refactorJacob Vosmaer2016-02-1712-26/+93
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-arc...Jacob Vosmaer2016-02-17181-981/+1795
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | First version of "git archive" headersJacob Vosmaer2016-02-022-24/+3
* | | | | | 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
| * | | | | Use /raw/ requests for image diffsJacob Vosmaer2016-02-161-9/+9
| * | | | | Fix SVG blob renderingJacob Vosmaer2016-02-161-1/+7
* | | | | | Merge branch 'fix/13517-impossible-subsequent-issuable-edits-in-sidebar' into...Douwe Maan2016-02-172-4/+4
|\ \ \ \ \ \
| * | | | | | Fix a bug preventing from doing subsequent edits in any Issuable sidebarfix/13517-impossible-subsequent-issuable-edits-in-sidebarRémy Coutable2016-02-172-4/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'klowner/gitlab-ce-fix-compare-by-tag-crash' into 'master' Douwe Maan2016-02-171-0/+2
|\ \ \ \ \ \
| * | | | | | Fix 500 error when comparing by tagsMark Riedesel2016-02-171-0/+2
* | | | | | | Fix double scrollbar issuesJacob Schatz2016-02-171-0/+16
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'issue_13359' into 'master' Jacob Schatz2016-02-172-10/+21
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Wrap issue details to prevent content misalignmentissue_13359Alfredo Sumaran2016-02-162-9/+16
| * | | | | Change "opened by" to just "by"Alfredo Sumaran2016-02-161-1/+1
| * | | | | Prevent author name to split into multiple linesAlfredo Sumaran2016-02-151-1/+1
| * | | | | Prevent split time into multiple lines for better readingAlfredo Sumaran2016-02-151-0/+4
View Lorry Controller Status