Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2016-03-01Merge branch 'rs-improve-grace-period' into 'master'Douwe Maan
Don't show any "2FA required" message if it's not actually required Prior, if the user had enabled and then disabled 2FA, they would be shown a "You must enable Two-factor Authentication for your account." message when going back to re-activate it, even if 2FA enforcement was disabled. See merge request !3014
2016-03-01Merge branch 'issue_13648' into 'master'Dmitriy Zaporozhets
Improve implementation to check read access to forks and add pagination. Fixes #13648 The following optimizations where made: - Pagination was added. - Code to check for read permissions to forks was optimized, in the past we were doing too many queries for each project. See merge request !2991
2016-03-01Merge branch 'issue_13621' into 'master'Douwe Maan
Don't repeat labels listed on Labels tab. Fixes #13622 See merge request !2924
2016-03-01Merge branch 'issue_13851' into 'master' Rémy Coutable
Brings back missing "Gitlab" text on the logo Closes #13851 See merge request !2989
2016-03-01Merge branch '11489-branded-appearance-to-ce' into 'master'Douwe Maan
Branded appearance to CE Closes #11489 The difference with the EE version is only that there is no distinction between light and dark logos, though this wasn't used anyway. If this is fine, I'll create a MR on EE too. TODO: - [x] Copy docs - [x] Make new screenshots - [ ] Remove Custom Welcome message feature? @rymai: I was unsure what labels to add to ping you, so I just ping you like this :wink: /cc @DouweM See merge request !2927
2016-02-26Merge branch 'sidebar-hide-class' into 'master' Rémy Coutable
Created helper class to hide content in issue sidebar when collapsed ![Screen_Shot_2016-02-25_at_10.38.39](/uploads/ca49cc230edf7e71b7726e905f523092/Screen_Shot_2016-02-25_at_10.38.39.png) Closes #13764 See merge request !2968
2016-02-26Merge branch 'fix-todos' into 'master'Robert Speicher
Does not create a Todo when commenting on commit or project snippet Closes #13733 See merge request !2964
2016-02-26Merge branch 'rs-crowd-form-view-spec' into 'master' Rémy Coutable
Move "I should see Crowd login form" feature to a view spec We were doing all kinds of code gymnastics to "enable" Crowd in the feature spec and this would sometimes cause a transient failure. Really what it's testing is if the Crowd login form shows when Crowd's enabled, so this is much better suited to a view spec. See merge request !2963
2016-02-26Merge branch 'feature/jschatz1/sidebar-sizing' into 'master'Jacob Schatz
Sidebar overlaps content when screen is below 1200px. When screen is below 1200px, the sidebar overlaps. When screen is above 1200px, the sidebar pushes content out. z-index change to make sure hamburger stays on top. Fixes #12717 ![screensize](/uploads/9a21fa06d583a49d6ebbf1ada34c6792/screensize.gif) ![screensize-small](/uploads/7c25f46e962248a40840562a01c83f8f/screensize-small.gif) Also sorry I couldn't get the collapse button in the screen cap. It's there. See merge request !2620
2016-02-24Merge branch 'highlighted-note' into 'master'Jacob Schatz
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
2016-02-24Merge branch 'fix-moving-revert-button' into 'master'Jacob Schatz
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
2016-02-24Merge branch 'bugfix/jschatz1/missing-project-button' into 'master'Rémy Coutable
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
2016-02-24Merge branch 'issue-sidebar-content-scrolling' into 'master'Jacob Schatz
Fixed issue with content in the issue sidebar disappearing Closes #13626 See merge request !2919
2016-02-24Merge branch 'hudecof/show-crowd-login-form-when-signin-disabled' into 'master'Robert Speicher
Show Crowd login even when sign-in is disabled Fixes #13176. See merge request !2749
2016-02-24Merge branch 'fix-todos' into 'master'Robert Speicher
Does not raise an error when Todo is already marked as done Closes #13681 See merge request !2926
2016-02-23Merge branch 'dz-small-ui-fixes' into 'master'Jacob Schatz
Set of UI fixes * Improve wiki pages * Improve profile pages cc @skyruler See merge request !2758
2016-02-23Merge branch 'milestone-drag-empty-list' into 'master'Jacob Schatz
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
2016-02-23Merge branch 'fix/13631-error-with-merged-mr' into 'master' Rémy Coutable
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
2016-02-23Merge branch 'issue_13463' into 'master' Jacob Schatz
Fix Side-by-side view after loading diff results Fixes #13463 See merge request !2880
2016-02-23Merge branch 'fix-failing-issue-tests' into 'master' Rémy Coutable
Fixed failing issues tests Also removed up/down vote icons from merge requests. Was missed from d8069bd85863ab8c47d2bb2370221b17fb686b93 See merge request !2911
2016-02-22Merge branch 'fix-zero-votes-showing-on-issue-list' into 'master' Rémy Coutable
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
2016-02-22Merge branch 'tasks' into 'master' Douglas Barbosa Alexandre
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
2016-02-22Merge branch 'merge-when-succeeded' into 'master' Douwe Maan
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
2016-02-21Merge branch 'award-emoji-retina' into 'master' Jacob Schatz
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
2016-02-21Merge branch 'flush-cache-web-editor' into 'master' Douwe Maan
Flush emptiness caches whenever needed See merge request !2903
2016-02-21Merge branch 'visibletrap/gitlab-ce-label'Douwe Maan
2016-02-21Merge branch '12792-emoji-as-text-diff-comment'Douwe Maan
2016-02-19Merge branch 'issue_3276' into 'master' Jacob Schatz
Labels should be visible in milestone view Closes #3276 See merge request !2599
2016-02-19Merge branch 'commit-status-fix' into 'master' Kamil Trzciński
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
2016-02-19Merge branch 'issue_3409' into 'master' Robert Speicher
Add ability to revert changes introduced by Merge Requests or Commits Closes #3409 See merge request !1990
2016-02-19Merge branch 'bugfix/jschatz1/issuable-consistency' into 'master' Rémy Coutable
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
2016-02-19Merge branch 'ci/remove-builds' into 'master' Grzegorz Bizon
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
2016-02-19Merge branch 'axil/gitlab-ce-mention-project-in-fork-notice' into 'master' Rémy Coutable
Mention project name in fork notice _Originally opened at !1186 by @axil._ - - - I missed this one in !1070 See merge request !2897
2016-02-19Merge branch 'saml-decoupling' into 'master'Patricio Cano
2016-02-19Merge branch 'ci/api-runners' into 'master' Kamil Trzciński
Add runners API References #4264 See merge request !2640
2016-02-19Merge branch 'issue_11872' into 'master' Jacob Schatz
Put project visibility icon next to title Fixes #11872 See merge request !2885
2016-02-19Merge branch '12791-hide-project-limit-reached-warning' into 'master' Douwe Maan
Project limit is reached warning is hidden when the projects_limit is zero Fixes #12791 See merge request !2890
2016-02-19Merge branch 'rs-emoji' into 'master' Douwe Maan
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
2016-02-19Merge branch 'fix/project-forks-page' into 'master' Douwe Maan
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
2016-02-19Merge branch 'rs-show-owner-label' into 'master' Douwe Maan
Allow `ProjectTeam#human_max_access` to return "Owner" See merge request !2881
2016-02-19Merge branch 'autocrlf-lazy' into 'master' Robert Speicher
Only set autocrlf when creating/updating files Related issue: gitlab-org/gitlab-ce#13457 Details: 5619a6de1dd6fc1dfd4053810c7b11c677b7a495 See merge request !2859
2016-02-18Merge branch 'bugfix/jschatz1/sidebar-fixes/02-18-16' into 'master' Dmitriy Zaporozhets
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
2016-02-18Merge branch 'fix/gitpushservice-complexity-issue' into 'master' Douwe Maan
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
2016-02-18Merge branch 'fix/ci-first-job-allow-failure' into 'master' Kamil Trzciński
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
2016-02-18Merge branch 'rs-git-fetch-labels' into 'master' Kamil Trzciński
Fix labels for git clone/git fetch Project CI setting See merge request !2842
2016-02-18Merge branch 'issue_13539' into 'master' Robert Speicher
Reopened MRs should also be considered as open. Fixes #13539 See merge request !2866
2016-02-18Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master' Douwe Maan
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
2016-02-17Merge branch 'bugfix/jschatz1/milestone-icon' into 'master' Rémy Coutable
Correct icon for milestones. See merge request !2856
2016-02-17Merge branch 'fix/13464-order-line-notes-create_at-in-parallel-diff-view' ↵Douwe Maan
into 'master' Sort line notes used in parallel diff by created_at Fixes #13464. See merge request !2858
2016-02-17Merge branch 'fix/13367-redirect-to-project-page-if-no-import' into 'master' Douwe Maan
Redirect /import to project page if no importing at all and repo exists Fixes gitlab-org/gitlab-ce#13367. See merge request !2857