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/lib
AgeCommit message (Collapse)Author
2016-05-04Merge branch 'use-rugged-to-create-tag' into 'master' Rémy Coutable
Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_tag for better performance This was originally opened at !1757 by @pcarranza but I changed it to use Rugged instead of gitlab_git, following @DouweM's request. Once this is merged, https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/26 will be mergeable too. See merge request !3745
2016-05-04Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'Douwe Maan
# Conflicts: # Gemfile.lock
2016-05-04Use Rugged's TagCollection#create instead of gitlab-shell's ↵Rémy Coutable
Repository#add_tag for better performance Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-03Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher
2016-04-29API support for the 'since' and 'until' operators on commit requestsPaco Guzman
- Parameter validation as ISO8601 format
2016-04-28Properly handle bigger filesZeger-Jan van de Weg
2016-04-28Replace gitlab-workhorse with GitLab Workhorse where appropriateAchilleas Pipinellis
2016-04-28Merge branch 'use-remote-ip-for-akismet' into 'master' Rémy Coutable
Use ActionDispatch Remote IP for Akismet checking Previously all remote IPs appeared at 127.0.0.1, which made Akismet not very useful. Using the ActionDispatch Remote IP (http://api.rubyonrails.org/classes/ActionDispatch/RemoteIp.html) should provide more reliable results. Closes #16629 See merge request !3961
2016-04-28Use ActionDispatch Remote IP for Akismet checkingStan Hu
Previously all remote IPs appeared at 127.0.0.1, which made Akismet not very useful. Using the ActionDispatch Remote IP (http://api.rubyonrails.org/classes/ActionDispatch/RemoteIp.html) should provide more reliable results. Closes #16629
2016-04-27Backport GitHub Enterprise import support from EEStan Hu
These changes were pulled from GitLab EE to support configuring an alternative API URL than the default https://api.github.com. In addition, the `verify_ssl` flag allows users to disable SSL cert checking. One modification: add a default `args` option if it does not exist to avoid breaking existing configurations.
2016-04-26Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski
2016-04-26Merge branch '15579-filter-milestone-confidential-issues-api' into 'master' Robert Speicher
Prevent information disclosure via milestone API Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15579 See merge request !1961
2016-04-25Merge branch 'fix-private-snippet-api' into 'master' Robert Speicher
Prevent information disclosure via snippet API Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15580 See merge request !1958
2016-04-25Merge branch 'emoji-unicode-fix' into 'master' Jacob Schatz
Fixes issue with emoji comments not showing correct emoji image Previously it would look for the unicode character inside the award menu. But this menu might not always be there. Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character Fixes #15512 See merge request !3885
2016-04-25Merge branch 'issue_14904' into 'master' Jacob Schatz
Add new shortcuts Closes #14904 - On a project: `i` To navigate to New Issue page. - On a issuable: `l` To open Label dropdown on a issuable. - Global: Typing `?` multiple times now toggles the modal. See merge request !3686
2016-04-25Prevent private snippets in public/internal projects from being leaked via APIStan Hu
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15580
2016-04-25Merge branch 'rs-503-page' into 'master' Dmitriy Zaporozhets
Add a branded 503 static error page [ci skip] Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15398 See merge request !3894
2016-04-25Filter confidential issues from milestones API if user does not have accessStan Hu
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15579
2016-04-25Merge branch 'fix-project-hook-delete-permissions' into 'master' Rémy Coutable
Prevent users from deleting Webhooks via API they do not own Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15576 See merge request !1959
2016-04-25Prevent users from deleting Webhooks via API they do not ownStan Hu
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15576
2016-04-22Removed usage of normilizeEmojiName methodPhil Hughes
Fixed some Ruby based on feedback
2016-04-22Add a branded 503 static error pageRobert Speicher
[ci skip] Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15398
2016-04-22Fix some typosTomasz Maczukin
2016-04-22Modify code formattingTomasz Maczukin
2016-04-22Simplify the GitlabCiYamlProcessor#initial_parsing methodTomasz Maczukin
2016-04-22Add posibility to define a hidden job without 'script' in .gitlab-ci.ymlTomasz Maczukin
2016-04-22Fixes issue with emoji comments not showing correct emoji imagePhil Hughes
Previously it would look for the unicode character inside the award menu. But this menu might not always be there. Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character Fixes #15512
2016-04-21Merge branch 'dev_issue_15331' into 'master' Robert Speicher
Fixes window.opener bug Adds `noreferrer` value to rel attribute for external links REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15331 See merge request !1953
2016-04-21Fix failing specAlfredo Sumaran
2016-04-21Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran
2016-04-21Use SIGTERM during Sidekiq memory shutdownJacob Vosmaer
This makes the memory killer behave more like 'sidekiqctl stop'.
2016-04-21Revert "Merge branch 'sentry-js' into 'master' "Jacob Schatz
This reverts commit 0f309794e78243b1ee16ba6f1451dbb0752956c5, reversing changes made to 1e596fef1c42a1dd925636c48fea01be444dc3ab.
2016-04-21Merge branch 'fix/cross-project-labels-project-reference' into 'master' Grzegorz Bizon
Fix cross-project label ref used with invalid project When cross-project label reference was used with invalid project reference, `nil` was assigned to project variable which later caused an exception. Closes #15168 See merge request !3811
2016-04-21Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński
Ci::Commit becomes a Pipeline object 1. Ci::Commit receives context: ref, :tag. 1. One Ci::Commit describes a one Pipeline 1. Pipeline is created from `.gitlab-ci.yml` 1. Pipeline is a ordered group of builds 1. We test MR against Pipeline 1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future) 1. We add a Pipeline Hook that will be triggered on Pipeline status change (future) 1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future) After merging that I'll prepare a separate MR that will unify naming, database columns, table names: ``` Ci::Commit -> Pipeline Ci::Build -> Build CommitStatus -> Job GenericCommitStatus -> ExternalJob ci_commits -> pipelines ci_builds -> jobs ``` This MR implements first 5 points. This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149. See merge request !3653
2016-04-21Refactor banzai code that finds cross-project labelsGrzegorz Bizon
2016-04-21Fix cross-project label ref with invalid projectGrzegorz Bizon
Closes #15168
2016-04-21Add noreferrer value to rel attribute for external linksAlfredo Sumaran
2016-04-21Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran
# Conflicts: # app/views/shared/issuable/_sidebar.html.haml
2016-04-21Merge branch 'fix-grape-internal-allowed-action' into 'master' Robert Speicher
Fix setting of "action" for Grape transactions After wondering why we're not getting all the data in Grafana that I wanted I realized I wasn't setting the "action" field properly here. See merge request !3842
2016-04-20Fix setting of "action" for Grape transactionsYorick Peterse
Merely setting the "action" tag will only result in the transaction itself containing a value for this tag. To ensure other metrics also contain this tag we must set the action using Transaction#action= instead.
2016-04-20Merge branch 'sentry-js' into 'master' Robert Speicher
Add Sentry logging for JavaScript errors Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12675 See merge request !3795
2016-04-20Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran
2016-04-20Fix Build#append_trace method usage when trace file doesn't exists yetTomasz Maczukin
2016-04-20Fix some typos in documentationTomasz Maczukin
[ci skip]
2016-04-20Add documentation of incremental trace update APITomasz Maczukin
[ci skip]
2016-04-20Make sure that appending is done on a valid lengthTomasz Maczukin
2016-04-20Add range checkingTomasz Maczukin
2016-04-20Add incremental build trace update APITomasz Maczukin
2016-04-20Merge branch 'slack_wiki_notifications' into 'master' Rémy Coutable
add slack notifications for wiki pages ## What does this MR do? Lets the Slack service be configured to send notifications when wiki pages are created or edited. ## Are there points in the code the reviewer needs to double check? I'm just starting to get familiar with the Gitlab codebase and I was unsure on how to get the wiki page url to pass it to the slack message, on whether or not I needed to refactor the create/update methods for wiki pages from the controller to a service (but seemed necessary to test it better), and if I needed to add a column to the web hooks table or if the services table would have been enough. Please let me know if I should change anything and I will improve the MR, thanks for checking :) ## Why was this MR needed? Related to #563 and fixes #4233. See merge request !2998
2016-04-20Merge branch 'license-templates-and-api-12804' into 'master' Robert Speicher
License templates when creating/editing a LICENSE file Closes #12804 See merge request !3660
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-17 08:04:12 +0300