summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'highlighted-note' into 'master'Jacob Schatz2016-02-247-9/+9
| | | | | | | | | | Changed padding & background color for highlighted notes Closes #12453 ![Screen_Shot_2016-02-23_at_11.18.59](/uploads/19150d884fd1175fe0df5f6daee64206/Screen_Shot_2016-02-23_at_11.18.59.png) See merge request !2937
* Merge branch 'fix-moving-revert-button' into 'master'Jacob Schatz2016-02-241-2/+2
| | | | | | | | | | | | | | Fixed revert button tooltip placement causing movement Before: ![moving-tooltip](/uploads/65cb9a41e8b8114fd8ee10d68cfd8206/moving-tooltip.gif) After: ![moving-tooltip](/uploads/a1c36eb5735dc7592c49f6b5cb1469b5/moving-tooltip.gif) See merge request !2910
* Merge branch 'bugfix/jschatz1/missing-project-button' into 'master'Rémy Coutable2016-02-243-9/+10
| | | | | | | | | | | | | | | | | Fix group projects styles Makes new project button visible when no projects are available. Fixes #13193 ![Screen_Shot_2016-02-04_at_1.08.27_PM](/uploads/36be9d5892506e7d1abcf4eb2a622e12/Screen_Shot_2016-02-04_at_1.08.27_PM.png) ![Screen_Shot_2016-02-04_at_1.07.48_PM](/uploads/fa257a1965017ff1274572dc66fccf90/Screen_Shot_2016-02-04_at_1.07.48_PM.png) ![Screen_Shot_2016-02-04_at_1.07.28_PM](/uploads/326f6fdac24b56e8408efd0d11dc2805/Screen_Shot_2016-02-04_at_1.07.28_PM.png) cc @creamzy @skyruler See merge request !2714
* Merge branch 'issue-sidebar-content-scrolling' into 'master'Jacob Schatz2016-02-241-28/+23
| | | | | | | | Fixed issue with content in the issue sidebar disappearing Closes #13626 See merge request !2919
* Merge branch 'hudecof/show-crowd-login-form-when-signin-disabled' into 'master'Robert Speicher2016-02-241-1/+1
| | | | | | | | Show Crowd login even when sign-in is disabled Fixes #13176. See merge request !2749
* Merge branch 'fix-todos' into 'master'Robert Speicher2016-02-242-2/+2
| | | | | | | | Does not raise an error when Todo is already marked as done Closes #13681 See merge request !2926
* Merge branch 'dz-small-ui-fixes' into 'master'Jacob Schatz2016-02-2319-88/+90
| | | | | | | | | | | Set of UI fixes * Improve wiki pages * Improve profile pages cc @skyruler See merge request !2758
* Merge branch 'milestone-drag-empty-list' into 'master'Jacob Schatz2016-02-231-9/+21
| | | | | | | | | | | | Issues can be dragged & dropped into empty milestone lists This is also possible with MRs. Also fixed an issue where MRs weren't sortable Fixes #13668 ![milestone](/uploads/aada0f48ce8b1407cce920eef3f4d5f3/milestone.gif) See merge request !2935
* Merge branch 'fix/13631-error-with-merged-mr' into 'master' Rémy Coutable2016-02-231-1/+1
| | | | | | | | | Ensure we don't check a commit's description for revert message if it has no description Fixes #13631. /cc @razer6 @grzesiek @yorickpeterse @rdavila See merge request !2917
* Merge branch 'issue_13463' into 'master' Jacob Schatz2016-02-233-1/+10
| | | | | | | Fix Side-by-side view after loading diff results Fixes #13463 See merge request !2880
* Merge branch 'fix-failing-issue-tests' into 'master' Rémy Coutable2016-02-232-13/+3
| | | | | | | Fixed failing issues tests Also removed up/down vote icons from merge requests. Was missed from d8069bd85863ab8c47d2bb2370221b17fb686b93 See merge request !2911
* Merge branch 'fix-zero-votes-showing-on-issue-list' into 'master' Rémy Coutable2016-02-222-11/+3
| | | | | | | | | Only show up or down votes icon on issue list if there are any Closes #13649 ![Screen_Shot_2016-02-22_at_10.20.27](/uploads/21477426856dab9731bb110032025867/Screen_Shot_2016-02-22_at_10.20.27.png) See merge request !2909
* Merge branch 'tasks' into 'master' Douglas Barbosa Alexandre2016-02-2224-14/+754
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Todos Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2425 Tasks: - Prepare database - [X] Create a new table (`todos`) - Tasks Queue view - [X] Add a number icon showing the number of todos on the top right next to the new and logout button that will redirect the user to the todos page - [X] Add a chronological list of todos, with the 'Todos' tab active by default - [X] Add a 'Done' button to each todo - [x] Add filters (project, author, type, and action) - Todos generation - [X] When user issue/mr is assgined to someone - [x] When user is mentioned on (issues/mr's/comments) - Mark todo as `done` - [X] When clicks on the 'Done' button - [X] When edit issue/mr - [X] When left/edit a comment - [X] When reassign issue/mr - [X] When add/remove labels to issue/mr - [X] When issue/mr is closed - [X] When mr is merged - [X] When added an emoji - [X] When changed the issue/mr milestone * Screenshot: ![Screenshot_2016-02-20_12.45.57](/uploads/4b2554b1bde25aed3347e1ae41e8e0c0/Screenshot_2016-02-20_12.45.57.png) See merge request !2817
* Merge branch 'merge-when-succeeded' into 'master' Douwe Maan2016-02-223-15/+25
| | | | | | | | | | | | | Fix bugs in MergeWhenSucceeded 1. This fixes support for merge when succeeded for statuses without ref. 2. This fixes support for merge when succeeded for multiple stages. Stages are created after all builds for previous one are finished. Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/9060 https://gitlab.com/gitlab-org/gitlab-ce/issues/8108 https://gitlab.com/gitlab-org/gitlab-ce/issues/12931 https://gitlab.com/gitlab-org/gitlab-ce/issues/13269 /cc @grzesiek @DouweM @rspeicher See merge request !2894
* Merge branch 'award-emoji-retina' into 'master' Jacob Schatz2016-02-213-0/+10
| | | | | | | | | | | | | | | | | | | | | Award emoji supports retina displays Based on discussion in !2800 There is now a retina spritesheet for emojis. It is 2mb, don't know how big an issue that is. Before: ![Screen_Shot_2016-02-19_at_11.07.25](/uploads/ea412579bcaddfd13fce67bf583de61b/Screen_Shot_2016-02-19_at_11.07.25.png) After: ![Screen_Shot_2016-02-19_at_11.07.36](/uploads/9d44c6278ba31987bad03dc1f46edd8b/Screen_Shot_2016-02-19_at_11.07.36.png) Also updated the rake task to make the @2x spritesheet https://gitlab.com/snippets/15348 cc\ @rspeicher @vsizov See merge request !2891
* Merge branch 'flush-cache-web-editor' into 'master' Douwe Maan2016-02-211-0/+4
| | | | | | | Flush emptiness caches whenever needed See merge request !2903
* 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
| | | | | | | Labels should be visible in milestone view Closes #3276 See merge request !2599
* Merge branch 'commit-status-fix' into 'master' Kamil Trzciński2016-02-192-4/+4
| | | | | | | | | | | | | | | Fix missing ignored? for GenericCommitStatus This is pretty important fix. We should not release 8.5 without this. It critical error when handling GenericCommitStatus: ``` undefined method `ignored?' for #<GenericCommitStatus:0x007fe1a2a20fe0> ``` cc @grzesiek See merge request !2899
* Merge branch 'issue_3409' into 'master' Robert Speicher2016-02-1918-30/+321
| | | | | | | Add ability to revert changes introduced by Merge Requests or Commits Closes #3409 See merge request !1990
* Merge branch 'bugfix/jschatz1/issuable-consistency' into 'master' Rémy Coutable2016-02-191-1/+1
| | | | | | | | | Consistency in MR and issue header. Fixes: #13550 ![Screen_Shot_2016-02-18_at_11.20.19_AM](/uploads/8327ff045e45029b85b2cbac72c98a7f/Screen_Shot_2016-02-18_at_11.20.19_AM.png)![Screen_Shot_2016-02-18_at_11.20.55_AM](/uploads/f79613ebb23e4a62fb1bdb48d6f7fd2b/Screen_Shot_2016-02-18_at_11.20.55_AM.png) See merge request !2874
* Merge branch 'ci/remove-builds' into 'master' Grzegorz Bizon2016-02-193-27/+92
| | | | | | | | | | | | | | | Make it possible to erase build content (artifacts, trace) This feature makes it possible to remove build content - build artifacts and build traces. - [x] Remove artifacts - [x] Remove metadata - [x] Remove build traces - [x] Wait for https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 this to be merged - [x] Fix the permissions after the merge Closes #3421 See merge request !2560
* Merge branch 'axil/gitlab-ce-mention-project-in-fork-notice' into 'master' Rémy Coutable2016-02-191-1/+1
| | | | | | | | | | | Mention project name in fork notice _Originally opened at !1186 by @axil._ - - - I missed this one in !1070 See merge request !2897
* 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
| | | | | | | Add runners API References #4264 See merge request !2640
* Merge branch 'issue_11872' into 'master' Jacob Schatz2016-02-192-17/+13
| | | | | | | Put project visibility icon next to title Fixes #11872 See merge request !2885
* Merge branch '12791-hide-project-limit-reached-warning' into 'master' Douwe Maan2016-02-191-1/+1
| | | | | | | Project limit is reached warning is hidden when the projects_limit is zero Fixes #12791 See merge request !2890
* Merge branch 'rs-emoji' into 'master' Douwe Maan2016-02-194-1276/+1724
| | | | | | | | | Update Gemojione for new hotness :sparkles: Before | After ------ | ----- ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png) See merge request !2800
* Merge branch 'fix/project-forks-page' into 'master' Douwe Maan2016-02-191-1/+1
| | | | | | | | | | | | | | | workaround for forks with an invalid repo Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13465 The error occurs when a project returns a `nil` commit for a variety of reasons, I assume the repository is corrupt - perhaps as a result of a failed fork. With this MR, we do not show forks with corrupted repos in the list of forks, as this does not seem to work anyway. A better solution is to fix the cause of the issue and/or any data integrity problem... Also fixing Sentry issue: 1180 `undefined method 'already_forked?' for nil:NilClass ` See merge request !2836
* Merge branch 'rs-show-owner-label' into 'master' Douwe Maan2016-02-191-1/+1
| | | | | | | Allow `ProjectTeam#human_max_access` to return "Owner" See merge request !2881
* Merge branch 'autocrlf-lazy' into 'master' Robert Speicher2016-02-191-9/+14
| | | | | | | | Only set autocrlf when creating/updating files Related issue: gitlab-org/gitlab-ce#13457 Details: 5619a6de1dd6fc1dfd4053810c7b11c677b7a495 See merge request !2859
* Merge branch 'bugfix/jschatz1/sidebar-fixes/02-18-16' into 'master' Dmitriy Zaporozhets2016-02-182-16/+2
| | | | | | | | | | | | | | | | | | | Uses cross browser niceScroll to do scrolling on sidebar. Fixes: #13544 Firefox does not support `-webkit-scrollbar` and there is no alternative for FF. So for example Gmail falls back to no fancy scrollbar. Stuck with jQuery, which is a good solution, since we already use it. This also leaves the default scrollbar as is. ![Screen_Shot_2016-02-18_at_11.02.26_AM](/uploads/1184f06b71a8d9097ef1e3450a0c0ab3/Screen_Shot_2016-02-18_at_11.02.26_AM.png) Also fixes horz scroll issue: ![Screen_Shot_2016-02-18_at_11.09.56_AM](/uploads/63e9a8e824cac69a2745dd4dd84d1dfb/Screen_Shot_2016-02-18_at_11.09.56_AM.png) cc @creamzy @dzaporozhets See merge request !2873
* Merge branch 'fix/gitpushservice-complexity-issue' into 'master' Douwe Maan2016-02-182-58/+62
| | | | | | | | | | | | | | | | Reduce code complexity on GitPushService#execute Code complexity for gitlab-ce after this has been refactored: ``` 27.3: GitPushService#execute ``` This still needs to be merged into `gitlab-ee` presumably with conflicts... Perhaps we should create another issue for doing that? I left the code sort of similar to what it was... If I could, I would have refactored most of the code into separate classes, etc. as it breaks probably all SOLID principles. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13327 See merge request !2784
* Merge branch 'fix/ci-first-job-allow-failure' into 'master' Kamil Trzciński2016-02-181-0/+1
| | | | | | | | | Fix CI builds scheduler when first build in stage is allowed to fail This fixes an edge case in CI builds scheduler when first build in stage was marked as allowed to fail. Closes #3192 See merge request !2869
* Merge branch 'rs-git-fetch-labels' into 'master' Kamil Trzciński2016-02-181-2/+2
| | | | | | | Fix labels for git clone/git fetch Project CI setting See merge request !2842
* Merge branch 'issue_13539' into 'master' Robert Speicher2016-02-181-1/+1
| | | | | | | Reopened MRs should also be considered as open. Fixes #13539 See merge request !2866
* Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master' Douwe Maan2016-02-187-3/+88
| | | | | | | | | | | | | | | | | | | 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
* 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-172-3/+13
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 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-172-3/+13
| |/ | | | | | | Fixes #13367.
* | Merge branch 'expire-fork-import-caches' into 'master' Douwe Maan2016-02-174-1/+32
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-173-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |