summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | attempt to reduce code complexity on GitPushService#executeJames Lopez2016-02-113-80/+123
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs-update-unicorn' into 'master' Dmitriy Zaporozhets2016-02-182-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump unicorn to `~> 4.9.0` Closes #2820 See merge request !2843
| * | | | | | | | | | | Bump unicorn to `~> 4.9.0`rs-update-unicornRobert Speicher2016-02-162-3/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'issue_13539' into 'master' Robert Speicher2016-02-182-1/+35
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reopened MRs should also be considered as open. Fixes #13539 See merge request !2866
| * | | | | | | | | | | | Reopened MRs should also be considered as open.issue_13539Rubén Dávila2016-02-172-1/+35
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sqlite_rm_rf' into 'master' Achilleas Pipinellis2016-02-171-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove remaining sqlite method call Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13535 See merge request !2862
| * | | | | | | | | | | Remove remaining sqlite method callAchilleas Pipinellis2016-02-171-1/+0
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master' Douwe Maan2016-02-1714-3/+247
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to see and sort on vote count from Issues and MR lists Fixes #3763 * Sort options ![Sort Options](/uploads/df6543d574d4df8bf7e4496a876e2930/sort.png) * Most popular ![Most popular](/uploads/bb92cc2fbef7b6b806dcdf8c52778fdd/most-popular.png) * Least popular ![Least popular](/uploads/7988ed451922c81dc228419b5edbd7cd/least-popular.png) See merge request !2781
| * | | | | | | | | | | Add ability to see and sort on vote count from Issues and MR listssee-and-sort-on-vote-count-mr-issuesDouglas Barbosa Alexandre2016-02-1714-3/+247
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'git-archive-refactor' into 'master' Douwe Maan2016-02-1711-71/+77
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor 'git archive' hand-off to gitlab-workhorse We have a nicer way now to hand off HTTP responses to gitlab-workhorse. Companion MR: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/36 See merge request !2675
| * | | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵git-archive-refactorJacob Vosmaer2016-02-1717-35/+149
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-archive-refactor
| * | | | | | | | | | | Add newlineJacob Vosmaer2016-02-171-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Use gitlab-workhorse 0.6.5Jacob Vosmaer2016-02-172-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-02-17345-2076/+5704
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-archive-refactor
| * | | | | | | | | | | | Fix APIJacob Vosmaer2016-02-114-6/+29
| | | | | | | | | | | | |
| * | | | | | | | | | | | First version of "git archive" headersJacob Vosmaer2016-02-027-66/+49
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceRémy Coutable2016-02-1771-591/+1178
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bugfix/jschatz1/milestone-icon' into 'master' Rémy Coutable2016-02-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct icon for milestones. See merge request !2856
| | * | | | | | | | | | | | | 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' ↵Douwe Maan2016-02-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Sort line notes used in parallel diff by created_at Fixes #13464. See merge request !2858
| | * | | | | | | | | | | | | Sort line notes used in parallel diff by created_atRémy Coutable2016-02-171-1/+1
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #13464.
| * | | | | | | | | | | | | Merge branch 'fix/13367-redirect-to-project-page-if-no-import' into 'master' Douwe Maan2016-02-173-3/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect /import to project page if no importing at all and repo exists Fixes gitlab-org/gitlab-ce#13367. See merge request !2857
| | * | | | | | | | | | | | Redirect /import to project page if no importing at all and repo existsfix/13367-redirect-to-project-page-if-no-importRémy Coutable2016-02-173-3/+25
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #13367.
| * | | | | | | | | | | | Merge branch 'rs-issue-13469' into 'master' Douwe Maan2016-02-172-9/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle nil commits in Gitlab::PushDataBuilder.build Closes #13469 See merge request !2825
| | * | | | | | | | | | | | Handle nil commits in Gitlab::PushDataBuilder.buildrs-issue-13469Robert Speicher2016-02-152-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13469
| * | | | | | | | | | | | | Merge branch 'expire-fork-import-caches' into 'master' Douwe Maan2016-02-177-1/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expire caches after forking/importing a repository cc @dblessing @DouweM Related issue: gitlab-org/gitlab-ce#13505 See merge request !2838
| | * | | | | | | | | | | | | Flush all repository caches when deleting a repoexpire-fork-import-cachesYorick Peterse2016-02-172-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that _all_ caches (including any caches normally only flushed under certain conditions) are flushed whenever a project is removed. Because cache keys are based on project namespaces (excluding IDs) not doing so could result in a newly created project re-using old caches (if the project was re-created using the same name).
| | * | | | | | | | | | | | | Expire caches after forking/importing a repositoryYorick Peterse2016-02-176-0/+52
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures the caches for Repository#empty? and Repository#has_visible_content? are flushed after a repository has been imported or forked. Fixes gitlab-org/gitlab-ce#13505
| * | | | | | | | | | | | | Merge branch 'image-diff' into 'master' Douwe Maan2016-02-173-11/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes for showing images - Render scrubbed SVG's inline, not via /raw/ - Use /raw/ requests on image diffs Both of these are needed because of no longer eager loading blobs. This a follow-up to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2830 Also see https://gitlab.com/gitlab-org/gitlab-ce/issues/13350 See merge request !2837
| | * | | | | | | | | | | | | 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' ↵Douwe Maan2016-02-172-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix a bug preventing from doing subsequent edits in any Issuable sidebar Fixes #13517. Fixes #12572. ### Issue ![impossible-subsequent-issue-edits-in-sidebar](/uploads/bd45c0effb46848641932d9cd38d3fe2/impossible-subsequent-issue-edits-in-sidebar.gif) --- ### Merge request ![impossible-subsequent-mr-edits-in-sidebar](/uploads/b4e1e3e93df4ac0a3d962df8b6139de9/impossible-subsequent-mr-edits-in-sidebar.gif) /cc @jschatz1 @sytses See merge request !2848
| | * | | | | | | | | | | | | | 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 tags _Originally opened at !2787 by @klowner._ - - - Fixes #13171. Fixes #13370. See merge request !2849
| | * | | | | | | | | | | | | | Fix 500 error when comparing by tagsMark Riedesel2016-02-171-0/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'bugfix/jschatz1/sidebar/02-16-16' into 'master' Douwe Maan2016-02-171-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix double scrollbar issues Sidebar double scrollbar issue fix. ![Screen_Shot_2016-02-16_at_9.22.49_PM](/uploads/cb950eda08ed5d3b4a6c6979c977e029/Screen_Shot_2016-02-16_at_9.22.49_PM.png) See merge request !2851
| | * | | | | | | | | | | | | | Fix double scrollbar issuesJacob Schatz2016-02-171-0/+16
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge branch 'issue_13359' into 'master' Jacob Schatz2016-02-172-10/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents floated button group on issues view Issue #13359 ![screenshot](/uploads/962ac4f3f1f3d6ef87f7152c09090801/screenshot.jpg) See merge request !2826
| | * | | | | | | | | | | | | 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
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Move issue details after action buttonsAlfredo Sumaran2016-02-151-10/+10
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'update-allocations' into 'master' Yorick Peterse2016-02-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated the allocations Gem to 1.0.4 Sometimes the output of Allocations.to_hash may contain garbage. See https://gitlab.com/gitlab-org/allocations/commit/15d3a39f51392013dcf5f88dd21fab31201350ce for more information. See merge request !2816
| | * | | | | | | | | | | | | Updated the allocations Gem to 1.0.4update-allocationsYorick Peterse2016-02-151-1/+1
| | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes the output of Allocations.to_hash may contain garbage. See https://gitlab.com/gitlab-org/allocations/commit/15d3a39f51392013dcf5f88dd21fab31201350ce for more information.
| * | | | | | | | | | | | | Merge branch 'spec_fix' into 'master' Douwe Maan2016-02-171-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Award Emoji]: sporadic spec fix See merge request !2833
| | * | | | | | | | | | | | sporadic spec fixspec_fixValery Sizov2016-02-161-0/+2
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'doc-ci-variables-readme-fix' into 'master' Robert Speicher2016-02-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix table in doc/ci/variables/README.md The table was missing a column separator, causing GitLab to render the markdown incorrectly. [ci skip] See merge request !2840