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-08-25Capitalize mentioned issue timeline notesClement Ho
2016-08-04Merge branch 'master' into diff-line-comment-vuejsDouwe Maan
# Conflicts: # app/models/discussion.rb # db/schema.rb
2016-07-29Add 'Resolved all discussions' system noteDouwe Maan
2016-07-19Refactor system notes service to make it singletonGrzegorz Bizon
2016-07-06Services: code style fixes, minor refactoringValery Sizov
2016-07-01Enable Style/EmptyLines cop, remove redundant onesGrzegorz Bizon
2016-05-21Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'Douwe Maan
# Conflicts: # app/services/system_note_service.rb
2016-05-19Move #create_confidentiality_note to Issues::UpdateServiceRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-18Create DiffFilter and change SystemNoteService#change_title to use ↵Adam Butler
Gitlab::Diff::InlineDiff
2016-05-18Changing the confidentiality of an issue now creates a new system noteAlex Moore-Niemi
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-07Escape HTML in commit titles in system note messagesStan Hu
Closes #17348
2016-04-14Start with iid on branch creationZeger-Jan van de Weg
2016-04-01Added & use Gitlab::Routing for URL helpersYorick Peterse
Rails' "url_helpers" method creates an anonymous Module (which a bunch of methods) on every call. By caching the output of this method in a dedicated method we can shave off about 10 seconds of loading time for an issue with around 200 comments.
2016-03-20Merge branch 'master' into feature/issue-moveGrzegorz Bizon
* master: Fix bug where wrong commit ID was being used in a merge request diff to show old image Remove CHANGELOG item that was added during merge resolution Improve the "easy WIP & un-WIP from link" feature Fix specs \#to_branch_name now uses the iid as postfix Add label description in tooltip to labels in issue index and sidebar Easily (un)mark merge request as WIP using link Use specialized system notes when MR is (un)marked as WIP another attempt to fix oauth issue attempting to fix omniauth problem Conflicts: app/assets/javascripts/issuable_form.js.coffee
2016-03-19Merge branch 'remove-wip' into 'master' Jacob Schatz
Easily (un)mark merge request as WIP using link Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3768 and https://gitlab.com/gitlab-org/gitlab-ce/issues/3516 ## Link to add `WIP` prefix (underline is visible because of hover) ![wipless_title](/uploads/72a6f7119ba9d8043ca8329641e97c3b/wipless_title.png) ## Link to remove `WIP` prefix ![wip_title](/uploads/8620ad65da9ef620b180603520fead55/wip_title.png) ## System note after WIP is added ![wip_sysnote](/uploads/2de073b75e854d2c9e243eb8b5d5c259/wip_sysnote.png) ## Widget with link to remove WIP ![wip_widget](/uploads/cf83ea93743c4c26d9df759c17cb9d7b/wip_widget.png) ## Flash after WIP is removed ![wip_flash](/uploads/27b7240cd5d7ceeb8b7b477abd94d7ff/wip_flash.png) ## System note after WIP is removed ![wipless_sysnote](/uploads/c0d3368abdf21a2f253532a9a9594d90/wipless_sysnote.png) ## Widget when current user cannot remove the WIP prefix ![wip_widget_unauthorized](/uploads/174ccf1674be86dc81c3078fe297acb7/wip_widget_unauthorized.png) cc @creamzy See merge request !3006
2016-03-19Merge branch 'master' into feature/issue-moveGrzegorz Bizon
* master: (121 commits) Dedupe labels in labels selector in Dashboard pages Refactor colors and lists Add a safeguard in MergeRequest#compute_diverged_commits_count Fix an issue when the target branch of a MR had been deleted Add avatar to issue and MR pages header Cleanup somce css colors Re-group scss variables Refactor `Todo#target` Fixes issue with filter label missing on labels & milestones Rename `Todo#to_reference` to `Todo#target_reference` Fixed failing tests Updated controller with before_action Fixed other issues based on feedback Fixes issue on dashboard issues Full labels data in JSON Fixed issue with labels dropdown getting wrong labels Update CHANGELOG Use `Note#for_project_snippet?` to skip notes on project snippet Use `Commit#short_id` instead of `Commit.truncate_sha` Reuse `for_commit?` on conditional validations Update schema info comment on todo related files ... Conflicts: app/models/issue.rb db/schema.rb spec/models/issue_spec.rb
2016-03-19Merge remote-tracking branch 'origin/master' into remove-wipRémy Coutable
2016-03-19Improve the "easy WIP & un-WIP from link" featureRémy Coutable
2016-03-18\#to_branch_name now uses the iid as postfixZeger-Jan van de Weg
Given the branch name 'mep-mep' with an iid being 1, the current way, master's way, would yield a branch name of 1-mep-mep. The problem for larger projects however would be that a developer might forget what iid the issue was. When this developer would try to tab complete it would: - Or result in 20+ branches possibly - Or start with the wrong digit, try again with digit++ - Would see 20 branches, repeat Thus the obvious way of solving this is letting the dev tab complete on the issue title, which is easier to remember.
2016-03-17Add minor improvements in code related to issue moveGrzegorz Bizon
2016-03-17Improve system notes that are added when issue is movedGrzegorz Bizon
2016-03-17Add new system note used when issue has been movedGrzegorz Bizon
2016-03-15Incorporate the review and update specZeger-Jan van de Weg
The feature spec now also tests the absence of the new branch button
2016-03-15Incorporate reviewZeger-Jan van de Weg
2016-03-15Link in the note when started a new branch from an issueZeger-Jan van de Weg
2016-03-15Enhance new branch button on an issueZeger-Jan van de Weg
2016-03-03Add support for keyword arguments in label reference methodGrzegorz Bizon
2016-02-27Use specialized system notes when MR is (un)marked as WIPDouwe Maan
2016-02-16updated system note service and spec based on feedbackJames Lopez
2016-02-12woo hoo - getting there with the cross-reference issue. Should fix the ↵James Lopez
problem and updated spec
2016-02-04WIP - fix and spec for cross reference issue with forksJames Lopez
2015-12-24Use `to_reference` in system notes.Douwe Maan
2015-12-24Link to milestone in "Milestone changed" system noteDouwe Maan
2015-12-18Backport JIRA serviceDrew Blessing
2015-12-07Satisfy Douwe MaanZeger-Jan van de Weg
2015-12-07Merge branch 'master' into merge-if-greenZeger-Jan van de Weg
2015-12-07Button fixZeger-Jan van de Weg
2015-12-05Incorporate feedbackZeger-Jan van de Weg
2015-12-02Specs for 'Merge When Build Succeeds'Zeger-Jan van de Weg
2015-11-30Proper cross-project references when MR is closed by issueDouwe Maan
2015-11-23Refactor MergeWhenBuildSucceedsService and incorporate feedbackZeger-Jan van de Weg
2015-11-20Monkey patching TaskList::Item is no longer required. #2296Rubén Dávila
2015-11-20Generate system note after Task item has been updated on Issue or Merge ↵Ruben Davila
Request. #2296 Everytime the User check or uncheck a Task Item from the Issue or Merge Request description, a new update is going to be added to the activity logs of the Issue or Merge Request. Note that when using the edit form, you can only update the Task item status or add/delete/modify existing ones. Doing both actions is not fully supported.
2015-11-18API support, incorporated feedbackZeger-Jan van de Weg
2015-11-02Merge when build succeedsZeger-Jan van de Weg
2015-10-21Clean up MR refresh service somewhat.Douwe Maan
2015-10-16Reorder system note verb to say "Restored source branch X" instead of ↵Stan Hu
"Source branch X restored"
2015-10-16Improve SystemNote interface for branch add/restore caseStan Hu
2015-10-16Add a system note and update relevant merge requests when a branch is ↵Stan Hu
deleted or re-added If a branch is deleted with an open merge request, amended offline, and then pushed again, GitLab doesn't bother to update the merge request even though the last commit ID and/or code may have changed. This MR ensures that each push will update any relevant merge requests and adds a system note if this happens as well. Closes #2926
2015-06-14Fix hooks for web based events with external issue referencesDaniel Gerhardt
The creation of cross references for external issues (which would fail) is now prevented. Fixes #1650, GH-9333.