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
AgeCommit message (Collapse)Author
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 '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 '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 '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-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 '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 '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-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 '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 '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 '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-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-16sporadic spec fixValery Sizov
2016-02-15Fix the "x of y" displayed at the top of Issuables' sidebarRémy Coutable
1. We now display the index of the current issuable among all its project's issuables, of the same type and with the same state. 2. Also, refactored a bit the Issuable helpers into a new IssuablesHelper module. 3. Added acceptance specs for the sidebar counter.
2016-02-13Add spinach tests for award emojiStan Hu
2016-02-11Parse XML instead of HTML in tests for a SVG build badgeGrzegorz Bizon
2016-02-11Move build badge specs to badges directoryGrzegorz Bizon
2016-02-11Move builds badge implementation to new badges controllerGrzegorz Bizon
2016-02-11Inherit build badge access permissions from projectGrzegorz Bizon
2016-02-11Improve build badge tests, add another test caseGrzegorz Bizon
2016-02-11Add feature tests for builds status badgeGrzegorz Bizon
2016-02-10Change MR link to "View Open Merge Request"Douglas Barbosa Alexandre
2016-02-10Replaces "Create merge request" link with one to the MR when one existsDouglas Barbosa Alexandre
2016-02-09Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher
2016-02-06Allow limited Markdown in Broadcast MessagesRobert Speicher
Closes #11853
2016-02-04Merge remote-tracking branch 'origin/master' into ci-permissionsKamil Trzcinski
# Conflicts: # app/views/projects/builds/index.html.haml
2016-02-04Add behaviour tests for build permissionsKamil Trzcinski
2016-02-04Rename allow_guest_to_access_builds to public_buildsKamil Trzcinski
2016-02-04Update test after changes build page cssDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-03Merge branch 'support-akismet' into 'master' Robert Speicher
Support Akismet spam checking for creation of issues via API Currently any spam detected by Akismet for non-members via API will be logged in a separate table in the admin page. Closes #5612 See merge request !2266
2016-02-02Merge remote-tracking branch 'origin/master' into git-raw-workhorseJacob Vosmaer
2016-02-02Use truncate helper on spam logs listDouglas Barbosa Alexandre
2016-02-02Support Akismet spam checking for creation of issues via APIStan Hu
Currently any spam detected by Akismet by non-members via API will be logged in a separate table in the admin page. Closes #5612
2016-02-01Render sanitized SVG imagesStan Hu
Closes https://github.com/gitlabhq/gitlabhq/issues/9265
2016-02-01Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer
git-raw-workhorse
2016-01-29Added tests to emoji search field focusPhil Hughes
2016-01-29Prevent transient Capybara timeouts during feature testsRobert Speicher
The problem occurred because asset compilation takes a long time, so when the asset cache didn't exist and the first test ran, it would often (randomly) time out during the generation before the actual test even had a chance to run. Now we check if the cache exists before the suite runs, and if not, we manually fire a request to the root URL in order to generate it. This should allow subsequent tests to use the cached assets.
2016-01-28Cannot see a raw blob without workhorseJacob Vosmaer
2016-01-28Merge branch 'issue_2406' into 'master' Dmitriy Zaporozhets
Show list of forks for a given Project Closes #2406 See merge request !2376
2016-01-28Merge branch 'issue_5546' into 'master' Dmitriy Zaporozhets
Save list sort in a cookie Closes #5546 See merge request !2537
2016-01-27Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez
fix/unexistent-group-500
2016-01-27moved and refactored feature based on feedback. Also updated CHANGELOGJames Lopez
2016-01-26Merge branch 'ci/test-build-artifacts-scripts' into 'master' Douwe Maan
Add tests for clicking a row in build artifacts browser This adds a feature tests for clicking a row, which is handled by javascript event. /cc @ayufan See merge request !2551
2016-01-26feature and fix for 500 on group missingJames Lopez
2016-01-25Adds base64 background search icon.Jacob Schatz
All inputs of type `search` will have the gray background and search icon centered. Because the search magnifier is a bg image, I had to hide it with `[value=""]`. I added a little javascript to make sure each input always has it's own value.
2016-01-23Make default sorting preference work for Issues and MRs.Rubén Dávila
2016-01-23Merge branch 'master' into issue_5546Rubén Dávila
2016-01-23Make sorting preference reusable for all projects.Rubén Dávila
2016-01-22Add tests for clicking a row in build artifacts browserGrzegorz Bizon