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
2015-05-27Merge branch 'rs-issue-1690' into 'master'Dmitriy Zaporozhets
Better handle label references that aren't actually references Fixes #1690 See merge request !705
2015-05-23Version 7.11.2v7.11.2Patricio Cano
2015-05-21Version 7.11.1v7.11.1Job van der Voort
2015-05-21Version 7.11.0v7.11.0Job van der Voort
2015-05-21Merge branch 'cherry-pick-robert' into '7-11-stable'Douwe Maan
Cherrypicks for 7.11 See merge request !1826
2015-05-21Merge branch 'fix-atom-feeds' into 'master'Douwe Maan
Fix Atom feeds. Fixes #1643 and #1644. See merge request !688
2015-05-21Merge pull request #9316 from jvanbaarsen/gitlab-git-updateDouwe Maan
Updated the gitlab_git gem
2015-05-21Merge branch 'rs-issue-1568' into 'master'Douwe Maan
Work around a Chrome 43 bug preventing note editing Fixes #1568 - and I mean "fixes" I have no idea what causes this or why this fixes it and can't dig into it further right now, but the bug seems like a blocker so this needs to be fixed for 7.11. See merge request !684
2015-05-21Merge branch 'unauthorized-participants' into 'master'Dmitriy Zaporozhets
Don't send notifications to mentioned users that don't have access to the project in question. Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2325. See merge request !664
2015-05-21Customize the sanitization whitelist only onceRobert Speicher
Fixes #1651
2015-05-20Merge branch 'lexer_error_workaround' into 'master'Douwe Maan
workaround for buggy lexers It seems that some lexers can be buggy when used together with git blame. This results in a 500 error when a user tries to open the blame page in some cases. The workaround is pretty simple. Not only fall back to plaintext when the file content can't be guessed, but also when the lexer fails. This closes #1521 and #1646 /cc @DouweM @JobV It would be awesome to have this in a patch release for 7.11 or even in the release. But that's probably to late. See merge request !683
2015-05-20Merge branch 'explain-wip-mr' into 'master'Dmitriy Zaporozhets
Add explanation about WIP status to MR form. ![Screen_Shot_2015-05-15_at_13.48.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b3f70585255a043f07c61570549a90ba/Screen_Shot_2015-05-15_at_13.48.49.png) ![Screen_Shot_2015-05-15_at_13.49.01](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c9992708c8ef5ef4fa2bcc2c3173b8e3/Screen_Shot_2015-05-15_at_13.49.01.png) See merge request !666
2015-05-15Version 7.11.0.rc2v7.11.0.rc2Job van der Voort
2015-05-15Merge branch 'attr_encryped_no_db_connection' into 'master'Dmitriy Zaporozhets
Don't require DB connection in AttrEncrypted. See merge request !667
2015-05-15Version 7.11.0.rc1v7.11.0.rc1Job van der Voort
2015-05-15Merge branch '7-11-guides' into 'master'Job van der Voort
Update installation/update guides for 7.11. See merge request !665
2015-05-15Update installation/update guides for 7.11.Douwe Maan
2015-05-15Merge branch 'fix-653' into 'master'Dmitriy Zaporozhets
Fix push event. Fixes issue with !653. See merge request !663
2015-05-15Fix push event.Douwe Maan
2015-05-15Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets
2015-05-15Merge branch 'dashboard-references' into 'master'Dmitriy Zaporozhets
Fix reference links in dashboard activity and ATOM feeds. References like `@user` were not linked on the dashboard activity feed and in Atom feeds, because the reference parser depends on `@project` which isn't set in those situations. This MR passes the project in question to the reference parsers in an option. cc @rspeicher See merge request !653
2015-05-15Merge branch 'spinner-spin' into 'master'Dmitriy Zaporozhets
Spin icon next to "Checking for CI status..." Stationary spinners make me sad. See merge request !655
2015-05-15Merge branch 'use-count-badges' into 'master'Dmitriy Zaporozhets
Use count badges with number_with_delimiter helper for issue, commit count See merge request !658
2015-05-15Merge pull request #9296 from jorgevbo/masterJeroen van Baarsen
Fix bug with default timezone en RSS gitlab events
2015-05-15Fix gemfile.lockDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-14Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets
2015-05-14Merge branch 'project_api_order' into 'master'Dmitriy Zaporozhets
Add order option for projects API https://dev.gitlab.org/gitlab/gitlab-ci/issues/222 See merge request !656
2015-05-14Merge branch 'rs-refactor-2fa' into 'master'Dmitriy Zaporozhets
Refactor SessionsController to use a controller concern See merge request !659
2015-05-14Fix bug with default timezone en RSS gitlab eventsJorge Vasquez
2015-05-14Refactor SessionsController to use a controller concernRobert Speicher
2015-05-14Merge branch 'fix-blob-path' into 'master'Douwe Maan
Fix broken view when viewing history of a file that includes a path that used to be another file Requires gitlab_git to v7.1.12 to be tagged and released. Closes #1598 See merge request !651
2015-05-14Merge pull request #9295 from afc163/masterJeroen van Baarsen
Add style for <kbd> element in markdown
2015-05-14Add style for <kbd> element in markdownafc163
Fixes #5825
2015-05-14Small refactoring of state_filters_text_for helperDmitriy Zaporozhets
2015-05-14append empty space only if count existsDmitriy Zaporozhets
2015-05-14Use count badges with number_with_delimiter helper for issue, commit countDmitriy Zaporozhets
2015-05-14Merge branch 'fewer-icons' into 'master'Dmitriy Zaporozhets
Use slightly fewer icons in project sidebar. ![Screen_Shot_2015-05-14_at_17.01.37](https://gitlab.com/gitlab-org/gitlab-ce/uploads/57928b7a0beb556f1e779d340b5e124f/Screen_Shot_2015-05-14_at_17.01.37.png) See merge request !657
2015-05-14Use slightly fewer icons in project sidebar.Douwe Maan
2015-05-14Merge branch 'rs-relative-link-filter' into 'master'Dmitriy Zaporozhets
Minor RelativeLinkFilter cleanup See merge request !649
2015-05-14Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets
2015-05-14Merge branch 'omniauth-csrf' into 'master'Dmitriy Zaporozhets
Protect OmniAuth request phase against CSRF. Addresses #2268. See merge request !1793
2015-05-14Merge branch 'fix-group-mention' into 'master'Dmitriy Zaporozhets
Fix mentioning of private groups. `issue.participants` would mistakenly not send the `current_user` to `mentioned_users`, which means it would search for referenced groups and users as if the user was signed out. Since signed out users don't have access to private groups (groups without public projects) and since you can't reference a group you don't have access to (since this would leak its existence), the group reference wasn't found and the group members weren't notified. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2326. See merge request !654
2015-05-14update API docValery Sizov
2015-05-14Add order option for projects APIValery Sizov
2015-05-14Merge branch 'note-action-icons' into 'master'Dmitriy Zaporozhets
Always show note action icons. As discussed in #639. The delete icon becomes red on hover, the edit one becomes slightly darker. The "Link here" icon has been removed, and the link to the specific comment can now be found by clicking the post date ("3 months ago"), which is most other sites do it as well. ![Screen_Shot_2015-05-14_at_12.18.50](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a204fa3a042659fa53fcb70d7143c8d1/Screen_Shot_2015-05-14_at_12.18.50.png) See merge request !652
2015-05-14Spin icon next to "Checking for CI status..."Douwe Maan
2015-05-14Add changelog item.Douwe Maan
2015-05-14Fix mentioning of private groups.Douwe Maan
2015-05-14Fix reference links in dashboard activity and ATOM feeds.Douwe Maan
2015-05-14Always show note action icons.Douwe Maan