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
2018-04-30Exclude LDAP from OmniauthCallbackController base methodsJames Edwards-Jones
2018-04-26Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceNick Thomas
2018-04-26Merge branch 'ide-relative-url-fix' of gitlab.com:gitlab-org/gitlab-ceNick Thomas
2018-04-25fixed rubocopPhil Hughes
2018-04-25restore original script_name configPhil Hughes
2018-04-25Merge branch 'zj-storage-path-deprecation' into 'master'Douwe Maan
Legacy disk path refactor Closes gitaly#1111 See merge request gitlab-org/gitlab-ce!18364
2018-04-25added helper specPhil Hughes
2018-04-25Gitlab::Shell works on shard name, not pathZeger-Jan van de Weg
Direct disk access is done through Gitaly now, so the legacy path was deprecated. This path was used in Gitlab::Shell however. This required the refactoring in this commit. Added is the removal of direct path access on the project model, as that lookup wasn't needed anymore is most cases. Closes https://gitlab.com/gitlab-org/gitaly/issues/1111
2018-04-24[Backport] Burndown chart for group milestoneOswaldo Ferreira
2018-04-19Resolve "Improve tooltips of collapsed sidebars"Dennis Tang
2018-04-16Merge branch '8088_embedded_snippets_support' into 'master'Grzegorz Bizon
Embedded Snippets Support Closes #8088 See merge request gitlab-org/gitlab-ce!15695
2018-04-12Merge branch 'dm-archived-read-only' into 'master'Robert Speicher
Make archived projects completely read-only Closes #44788 See merge request gitlab-org/gitlab-ce!18136
2018-04-12Resolve "Clean up old project permissions frontend code"Mike Greiling
2018-04-11Show `New Issue` link for projectsBob Van Landuyt
When a user is not logged in, we want to show the `New Issue` link so he gets directed to the login flow first. When a project is archived, we never want to show the link.
2018-04-11Prevent awarding emoji when a project is archivedBob Van Landuyt
This prevents performing the requests, and disables all emoji reaction buttons
2018-04-06Merge branch '43246-checkfilter' into 'master'Sean McGivern
Resolve "Show a message when loading the issues / merge requests dashboard without filters" Closes #43246 See merge request gitlab-org/gitlab-ce!17961
2018-04-05Merge branch '42028-xss-diffs-10-6' into 'security-10-6'Douwe Maan
Port of "Fix XSS on commit diff view" for 10-6 See merge request gitlab/gitlabhq!2364
2018-04-04Fix links to subdirectories of a directory with a plus character in its pathDouwe Maan
2018-04-03Fixed dashboard filtering testsJan Provaznik
2018-03-29Merge branch 'add-canary-favicon' into 'master'Sean McGivern
Add canary favicon See merge request gitlab-org/gitlab-ce!12477
2018-03-27Update styling and use Gitlab::Utils.to_booleanEric Eastwood
2018-03-27'Assigned Issues' and 'Assigned Merge Requests' as dashboard user choicesElias Werberich
2018-03-15Fix import helper spec when a previous spec stubs settingsSean McGivern
This should use stub_omniauth_setting, not do it manually.
2018-03-13Merge branch 'rd-fix-github-url-when-listing-repositories-at-importing' into ↵Douwe Maan
'master' Fix provider server URL used when listing repos to import See merge request gitlab-org/gitlab-ce!17692
2018-03-13Fix provider server URL used when listing repos to importRubén Dávila
Also use Gitlab::Auth::OAuth::Provider.config_for to access OmniAuth config
2018-03-12Add helpers for labels dropdownKushal Pandya
2018-03-07Allow maintainers to edit directly in a forkBob Van Landuyt
2018-03-07fix failing spechaseeb
2018-03-06Merge branch 'master' into 'issue_38337'Felipe Artur
# Conflicts: # app/models/group.rb # db/schema.rb
2018-03-05Replace deprecated name_with_namespace with full_name in app and specDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-03-03Bring one group board to CEFelipe Artur
2018-03-03fixed failing testhaseeb
2018-03-01Remove u2f webpack bundleMike Greiling
2018-02-28embedded snippets supporthaseeb
2018-02-26Merge branch '41255-refactoring-of-blob-link-methods-in-blob_helper' into ↵Douwe Maan
'master' Resolve "Refactoring of blob link methods in blob_helper" Closes #41255 See merge request gitlab-org/gitlab-ce!16851
2018-02-26Don't convert issuable_initial_data into JSONJan Provaznik
Instead of converting hash into JSON inside issuable_initial_data method, return hash and convert to JSON later. This allows us to easily extend basic issuable data with resource specific values. For example for Epic these data should include also labels, so we can then do something like: issuable_initial_data(@epic).merge(labels: @epic.labels).to_json
2018-02-23refactor methods inlineJames Lopez
2018-02-23refactor code based on feedbackJames Lopez
2018-02-23some initial refactoringJames Lopez
2018-02-23Merge branch 'bvl-external-auth-port' into 'master'Douwe Maan
Port `read_cross_project` ability from EE See merge request gitlab-org/gitlab-ce!17208
2018-02-23Add Tip about Push to Create project on New Project pageAndré Luís
2018-02-22Port `read_cross_project` ability from EEBob Van Landuyt
2018-02-22Merge branch 'master' into 42431-add-auto-devops-and-clusters-button-to-projectsEric Eastwood
2018-02-20Move default_project_view tests to presenterOswaldo Ferreira
2018-02-20Move button list logic to project presenterOswaldo Ferreira
2018-02-15Escape HTML entities in commit messagesDouwe Maan
2018-02-13Extract repeated logic into #avatar_icon_for.Andreas Brandl
This essentially allows to pass both user and email, so that we can either prefer the user to retrieve the avatar or (if user is not present) fall back to the email lookup.
2018-02-13Remove generic #avatar_icon helper.Andreas Brandl
2018-02-13Explicit use of avatar_icon_* calls depending on situation.Andreas Brandl
We want to drop the generic #avatar_icon helper that supports both an email and a user object being passed in. Instead, we want to explicitly use the #avatar_icon_for_user and #avatar_icon_for_email helpers depending on what we have at hand. This allows us to avoid unnecessary database queries (e.g. call User.find_by_any_email if we already have the user). In situations like here, this makes it less convenient to use.
2018-02-13Use more specific #avatar_icon_for_user.Andreas Brandl
Whenever we already deal with a User object, let's use the more specific method avatar_icon_for_user.