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-02-09Merge branch ↵Douwe Maan
'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail' into 'master' Add option to include the sender name in body of Notify email _Originally opened at !2495 by @huacnlee._ - - - Fixes #7824. See merge request !2767
2016-02-09Merge branch '3kami3/gitlab-ce-root_email' into 'master' Douwe Maan
Add an option to supply root email through an environmental variable. _Originally opened at !2499 by @3kami3._ --- Add an option to supply root email through an environmental variable. See merge request !2751
2016-02-09Merge branch 'zj/gitlab-ce-unique-milestone-title-per-project'Douwe Maan
2016-02-09Add option to include the sender name in body of Notify email. fix #7824Jason Lee
2016-02-09Merge branch 'rs-broadcast-markdown' into 'master' Douwe Maan
Allow limited Markdown in Broadcast Messages Closes #11853 See merge request !2695
2016-02-09Merge branch 'increase_import_timeout' into 'master' Douwe Maan
Increase project import timeout from 4 minutes to 15 minutes Many users were experiencing timeouts when we only allowed 4 minutes before a timeout. A 15 minute timeout is more than reasonable and prevents us from having to add a configuration for this. Fixes gitlab-org/gitlab-ee#246 ## Import screenshot ![Screen_Shot_2016-02-04_at_1.45.20_PM](/uploads/d9d71ec953afae31e6fbe54a8932b945/Screen_Shot_2016-02-04_at_1.45.20_PM.png) See merge request !2717
2016-02-09update changelogValery Sizov
2016-02-09Merge branch 'snippet_search_refactoring'Valery Sizov
2016-02-09Merge branch 'caching-repository-git-operations' into 'master' Yorick Peterse
See merge request !2752
2016-02-08Merge branch 'fix-init' into 'master' Rémy Coutable
Fixed init.d script not working on OS X -s flag of su doesn't work correctly on OS X, logging in as the user and not running the requested command. By moving the bash shell init inside the su command we avoid the issue Fixes Issue #3309 See merge request !1728
2016-02-08Add an option to supply root email through an environmental variable.3kami3
2016-02-08Fixed init.d script not working on OS Xritave
-s flag of su doesn't work correctly on some systems, loging in the user and not running the requested command. By moving the bash shell init inside the su command we avoid the issue
2016-02-08Cache various Repository Git operationsYorick Peterse
This caches the output of the following methods: * Repository#empty? * Repository#has_visible_content? * Repository#root_ref The cache for Repository#has_visible_content? is flushed whenever a commit is pushed to a new branch or an existing branch is removed. The cache for Repository#root_ref is only flushed whenever a user changes the default branch of a project. The cache for Repository#empty? is never explicitly flushed as there's no need for it.
2016-02-08Merge branch 'kkm/gitlab-ce-user-diff-view-pref-cookie' into 'master' Rémy Coutable
Remember user's inline/tabular diff view preference in a cookie _Originally opened at !1677 by @kkm._ --- As per #3071, some users (we have a local EE installation) prefer 2-column view in diff. In this MR I add an implementation for this feature, using a cookie. Fixes #3071. See merge request !2723
2016-02-08Validate uniqueness of milestone title per projectZeger-Jan van de Weg
Fixes #3903
2016-02-07Update CHANGELOGRobert Speicher
[ci skip]
2016-02-06Allow limited Markdown in Broadcast MessagesRobert Speicher
Closes #11853
2016-02-06Update CHANGELOGRobert Speicher
[ci skip]
2016-02-05Merge branch 'rrott/gitlab-ce-logo-issue-11867' into 'master'Robert Speicher
Fixes for issue with poor logo transition animation on Safari See merge request !2690
2016-02-05fixed issue with poor logo transition animation on safariRoman Rott
updates after code review: moved coffee code to appropriate file, updated css to not use js-prefixed selectors Updated comments and Changelog Removed duplicate line in changelog
2016-02-05Faster snippet searchValery Sizov
2016-02-05Remember user's inline/tabular diff view preference in a cookiekkm
2016-02-04Increase project import timeout from 4 minutes to 15 minutesDrew Blessing
Many users were experiencing timeouts when we only allowed 4 minutes before a timeout. A 15 minute timeout is more than reasonable and prevents us from having to add a configuration for this. Fixes gitlab-org/gitlab-ee#246
2016-02-04Allow link_to_label to take an optional type argRémy Coutable
You can set type: :merge_request to create a link to merge request lists instead of issues list. Accept both Symbol & String as type argument for the link_to_label helper
2016-02-04Merge branch 'fix/atom-url-issue' into 'master' Douwe Maan
Fix atom url issue on projects This MR adds prevents a project to have a path ending in .atom that conflicts with the feed and Adds a migration to migrate old .atom projects to a different path Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699 See merge request !2651
2016-02-04Merge remote-tracking branch 'origin/rs-database-info'Dmitriy Zaporozhets
2016-02-04Merge branch 'rs-backport-ldap-2fa' into 'master' Dmitriy Zaporozhets
Support Two-factor Authentication for LDAP users Closes #12653 See merge request !2688
2016-02-04Merge branch 'better-search-autocomplete'Dmitriy Zaporozhets
2016-02-04Merge branch 'disable-remove-source-branch' into 'master' Douwe Maan
Hide remove source branch button when new commit is added to branch Fixes #3339 This MR hides the 'Remove source branch' button when a new commit is added to the source branch /cc @DouweM See merge request !2701
2016-02-04In search autocomplete show only groups and projects you are member ofDmitriy Zaporozhets
For big instances search autocomplet is flooded with groups you have no access to and insternal/public projects you don't care. It affects way how easily you can go to group/project you are actually member of Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-04Hide remove source branch button when new commit is added to branchZeger-Jan van de Weg
Fixes #3339 This MR hides the 'Remove source branch' button when a new commit is added to the source branch
2016-02-04Merge branch 'wipMergeSpacing' into 'master' Douwe Maan
No space required after WIP identifier Fixes #2426 Currently, the WIP: (or any other variation) prefix of a merge request title must include a trailing space for it to be recognized as a work in progress and prevent merging. To resolve this, I added an or pattern to the regexp to look for any one of the three possible delimiters ':', ']', or ' '. This way the trailing space isn't required but it still won't mark any titles beginning with wip as work in progress (e.g. "Wipwap"). See merge request !1876
2016-02-03Add sort dropdown to dashboard projects pageDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-03Support Two-factor Authentication for LDAP usersRobert Speicher
Closes #12653
2016-02-03Merge branch 'improve-groups-list' into 'master' Jacob Schatz
Improve UI consistency between projects and groups lists * add group description to the list * move new group button to top nav * move projects/users count icons to the right Fixes #3939 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2677
2016-02-03Improve UI consistency between projects and groups listsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-03Support download access by PRIVATE-TOKEN headerStan Hu
Currently there is no way to download a raw file without embedding the token in the URL, which exposes the token in the URL. There should be an way of sending this information via the header as the API does. Closes https://github.com/gitlabhq/gitlabhq/issues/8137
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-03Display database type and version in Administration dashboardRobert Speicher
Closes #12900
2016-02-02Update CHANGELOGRobert Speicher
[ci skip]
2016-02-02Merge branch 'update-newrelic-gem' into 'master' Dmitriy Zaporozhets
Bump New Relic gem version to avoid warnings in Web page This version has support for Grape, so we should consider removing the newrelic-grape gem as well: https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/grape-instrumentation See merge request !2578
2016-02-02Fix add_pagination_headers to keep request parameters in Link headerMichi302
2016-02-02Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issueJames Lopez
2016-02-02Update CHANGELOGDouglas 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-01Update CHANGELOGRobert Speicher
[ci skip]
2016-02-01Merge branch 'merge-request-closes-issues-performance' into 'master'Robert Speicher
Optimize fetching issues closed by a merge request Related issue: #12419 See merge request !2625
2016-02-01Render sanitized SVG imagesStan Hu
Closes https://github.com/gitlabhq/gitlabhq/issues/9265
2016-02-01Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issueJames Lopez
2016-02-01WIP - refactored migrationJames Lopez